d326a25e75
- Avoid segmentation fault in "join -i" with long line input (bnc#798541, VUL-1) - Avoid segmentation fault in "sort -d" and "sort -M" with long line input (bnc#798538, VUL-1) - Avoid segmentation fault in "uniq" with long line input (bnc#796243, VUL-1) - Fix test-suite errors (bnc#798261). OBS-URL: https://build.opensuse.org/request/show/149348 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/coreutils?expand=0&rev=84
18 lines
531 B
Diff
18 lines
531 B
Diff
Index: src/sort.c
|
|
===================================================================
|
|
--- src/sort.c.orig
|
|
+++ src/sort.c
|
|
@@ -5291,7 +5291,11 @@ main (int argc, char **argv)
|
|
{
|
|
if (!nthreads)
|
|
{
|
|
- unsigned long int np = num_processors (NPROC_CURRENT_OVERRIDABLE);
|
|
+ unsigned long int np;
|
|
+ if (getenv("OMP_NUM_THREADS"))
|
|
+ np = num_processors (NPROC_CURRENT_OVERRIDABLE);
|
|
+ else
|
|
+ np = 1;
|
|
nthreads = MIN (np, DEFAULT_MAX_THREADS);
|
|
}
|
|
|