qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

locale: Fix localedata/sort-test undefined behavior 

The collate-test.c triggers UB with an signed integer overflow,
which results in an error on some architectures (powerpc32).

Checked on x86_64, i686, and powerpc.
This commit is contained in:
Adhemerval Zanella 2021-11-03 16:20:05 -03:00
parent a6a9c1a36b
commit 3a523ccd78
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
localedata/collate-test.c
View File

@ -32,6 +32,12 @@ struct lines
static int xstrcoll (const void *, const void *); static int xstrcoll (const void *, const void *);
static int
signum (int n)
{
return (0 < n) - (n < 0);
}
int int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
@ -86,7 +92,7 @@ main (int argc, char *argv[])
srandom (atoi (argv[1])); srandom (atoi (argv[1]));
for (n = 0; n < 10 * nstrings; ++n) for (n = 0; n < 10 * nstrings; ++n)
{ {
int r1, r2, r; int r1, r2;
size_t idx1 = random () % nstrings; size_t idx1 = random () % nstrings;
size_t idx2 = random () % nstrings; size_t idx2 = random () % nstrings;
struct lines tmp = strings[idx1]; struct lines tmp = strings[idx1];
@ -96,9 +102,8 @@ main (int argc, char *argv[])
/* While we are at it a first little test. */ /* While we are at it a first little test. */
r1 = strcoll (strings[idx1].key, strings[idx2].key); r1 = strcoll (strings[idx1].key, strings[idx2].key);
r2 = strcoll (strings[idx2].key, strings[idx1].key); r2 = strcoll (strings[idx2].key, strings[idx1].key);
r = r1 * r2;
if (r > 0 || (r == 0 && r1 != 0) || (r == 0 && r2 != 0)) if (signum (r1) != - signum (r2))
printf ("`%s' and `%s' collate wrong: %d vs. %d\n", printf ("`%s' and `%s' collate wrong: %d vs. %d\n",
strings[idx1].key, strings[idx2].key, r1, r2); strings[idx1].key, strings[idx2].key, r1, r2);
} }