mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-08 14:20:07 +00:00
0f9e585480
[Modified from the original email by Siddhesh Poyarekar] This patch solves bug #16009 by implementing an additional path in strxfrm that does not depend on caching the weight and rule indices. In detail the following changed: * The old main loop was factored out of strxfrm_l into the function do_xfrm_cached to be able to alternativly use the non-caching version do_xfrm. * strxfrm_l allocates a a fixed size array on the stack. If this is not sufficiant to store the weight and rule indices, the non-caching path is taken. As the cache size is not dependent on the input there can be no problems with integer overflows or stack allocations greater than __MAX_ALLOCA_CUTOFF. Note that malloc-ing is not possible because the definition of strxfrm does not allow an oom errorhandling. * The uncached path determines the weight and rule index for every char and for every pass again. * Passing all the locale data array by array resulted in very long parameter lists, so I introduced a structure that holds them. * Checking for zero src string has been moved a bit upwards, it is before the locale data initialization now. * To verify that the non-caching path works correct I added a test run to localedata/sort-test.sh & localedata/xfrm-test.c where all strings are patched up with spaces so that they are too large for the caching path.
184 lines
4.2 KiB
C
184 lines
4.2 KiB
C
/* Test collation function via transformation using real data.
|
|
Copyright (C) 1997-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <ctype.h>
|
|
#include <error.h>
|
|
#include <locale.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdbool.h>
|
|
|
|
/* Keep in sync with string/strxfrm_l.c. */
|
|
#define SMALL_STR_SIZE 4095
|
|
|
|
struct lines
|
|
{
|
|
char *xfrm;
|
|
char *line;
|
|
};
|
|
|
|
static int xstrcmp (const void *, const void *);
|
|
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
int result = 0;
|
|
bool nocache = false;
|
|
size_t nstrings, nstrings_max;
|
|
struct lines *strings;
|
|
char *line = NULL;
|
|
size_t len = 0;
|
|
size_t n;
|
|
|
|
if (argc < 2)
|
|
error (1, 0, "usage: %s <random seed> [-nocache]", argv[0]);
|
|
|
|
if (argc == 3)
|
|
{
|
|
if (strcmp (argv[2], "-nocache") == 0)
|
|
nocache = true;
|
|
else
|
|
{
|
|
printf ("Unknown option %s!\n", argv[2]);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
setlocale (LC_ALL, "");
|
|
|
|
nstrings_max = 100;
|
|
nstrings = 0;
|
|
strings = (struct lines *) malloc (nstrings_max * sizeof (struct lines));
|
|
if (strings == NULL)
|
|
{
|
|
perror (argv[0]);
|
|
exit (1);
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
char saved, *word, *newp;
|
|
size_t l, line_len, needed;
|
|
|
|
if (getline (&line, &len, stdin) < 0)
|
|
break;
|
|
|
|
if (nstrings == nstrings_max)
|
|
{
|
|
strings = (struct lines *) realloc (strings,
|
|
(nstrings_max *= 2)
|
|
* sizeof (*strings));
|
|
if (strings == NULL)
|
|
{
|
|
perror (argv[0]);
|
|
exit (1);
|
|
}
|
|
}
|
|
strings[nstrings].line = strdup (line);
|
|
l = strcspn (line, ":(;");
|
|
while (l > 0 && isspace (line[l - 1]))
|
|
--l;
|
|
|
|
saved = line[l];
|
|
line[l] = '\0';
|
|
|
|
if (nocache)
|
|
{
|
|
line_len = strlen (line);
|
|
word = malloc (line_len + SMALL_STR_SIZE + 1);
|
|
if (word == NULL)
|
|
{
|
|
printf ("malloc failed: %m\n");
|
|
exit (1);
|
|
}
|
|
memset (word, ' ', SMALL_STR_SIZE);
|
|
memcpy (word + SMALL_STR_SIZE, line, line_len);
|
|
word[line_len + SMALL_STR_SIZE] = '\0';
|
|
}
|
|
else
|
|
word = line;
|
|
|
|
needed = strxfrm (NULL, word, 0);
|
|
newp = malloc (needed + 1);
|
|
if (newp == NULL)
|
|
{
|
|
printf ("malloc failed: %m\n");
|
|
exit (1);
|
|
}
|
|
strxfrm (newp, word, needed + 1);
|
|
strings[nstrings].xfrm = newp;
|
|
|
|
if (nocache)
|
|
free (word);
|
|
line[l] = saved;
|
|
++nstrings;
|
|
}
|
|
free (line);
|
|
|
|
/* First shuffle. */
|
|
srandom (atoi (argv[1]));
|
|
for (n = 0; n < 10 * nstrings; ++n)
|
|
{
|
|
int r1, r2, r;
|
|
size_t idx1 = random () % nstrings;
|
|
size_t idx2 = random () % nstrings;
|
|
struct lines tmp = strings[idx1];
|
|
strings[idx1] = strings[idx2];
|
|
strings[idx2] = tmp;
|
|
|
|
/* While we are at it a first little test. */
|
|
r1 = strcmp (strings[idx1].xfrm, strings[idx2].xfrm);
|
|
r2 = strcmp (strings[idx2].xfrm, strings[idx1].xfrm);
|
|
r = -(r1 ^ r2);
|
|
if (r)
|
|
r /= abs (r1 ^ r2);
|
|
|
|
if (r < 0 || (r == 0 && (r1 != 0 || r2 != 0))
|
|
|| (r > 0 && (r1 ^ r2) >= 0))
|
|
printf ("collate wrong: %d vs. %d\n", r1, r2);
|
|
}
|
|
|
|
/* Now sort. */
|
|
qsort (strings, nstrings, sizeof (struct lines), xstrcmp);
|
|
|
|
/* Print the result. */
|
|
for (n = 0; n < nstrings; ++n)
|
|
{
|
|
fputs (strings[n].line, stdout);
|
|
free (strings[n].line);
|
|
free (strings[n].xfrm);
|
|
}
|
|
free (strings);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
static int
|
|
xstrcmp (ptr1, ptr2)
|
|
const void *ptr1;
|
|
const void *ptr2;
|
|
{
|
|
const struct lines *l1 = (const struct lines *) ptr1;
|
|
const struct lines *l2 = (const struct lines *) ptr2;
|
|
|
|
return strcmp (l1->xfrm, l2->xfrm);
|
|
}
|