sort: fix sort -g infloop again

Problem reported by Giulio Genovese (Bug#55212).
* src/sort.c (nan_compare): To compare NaNs, simply printf+strcmp.
This avoids the problem of padding bits and unspecified behavior.
Args are now long double instead of char *; caller changed.
This commit is contained in:
Paul Eggert committed 2022-05-01 22:53:29 -07:00
1 parent e087525091
commit 2f56f5a420
2 files changed
+12 -15

No files matched your search

+6
View File
@@ -7,6 +7,12 @@ GNU coreutils NEWS -*- outline -*-
'mv --backup=simple f d/' no longer mistakenly backs up d/f to f~.
[bug introduced in coreutils-9.1]
'sort -g' no longer infloops when given multiple NaNs on platforms
like x86-64 where 'long double' has padding bits in memory.
Although the fix alters sort -g's NaN ordering, that ordering has
long been documented to be platform-dependent.
[bug introduced 1999-05-02 and only partly fixed in coreutils-8.14]
* Noteworthy changes in release 9.1 (2022-04-15) [stable]
+6 -15
View File
@@ -2003,22 +2003,13 @@ numcompare (char const *a, char const *b)
return strnumcmp (a, b, decimal_point, thousands_sep);
}
/* Work around a problem whereby the long double value returned by glibc's
strtold ("NaN", ...) contains uninitialized bits: clear all bytes of
A and B before calling strtold. FIXME: remove this function if
gnulib guarantees that strtold's result is always well defined. */
static int
nan_compare (char const *sa, char const *sb)
nan_compare (long double a, long double b)
{
long double a;
memset (&a, 0, sizeof a);
a = strtold (sa, NULL);
long double b;
memset (&b, 0, sizeof b);
b = strtold (sb, NULL);
return memcmp (&a, &b, sizeof a);
char buf[2][sizeof "-nan()" + CHAR_BIT * sizeof a];
snprintf (buf[0], sizeof buf[0], "%Lf", a);
snprintf (buf[1], sizeof buf[1], "%Lf", b);
return strcmp (buf[0], buf[1]);
}
static int
@@ -2046,7 +2037,7 @@ general_numcompare (char const *sa, char const *sb)
: a == b ? 0
: b == b ? -1
: a == a ? 1
: nan_compare (sa, sb));
: nan_compare (a, b));
}
/* Return an integer in 1..12 of the month name MONTH.