2008-03-31  Ulrich Drepper  <drepper@redhat.com>
	[BZ #6007]
	* string/strfry.c: Handle empty strings again.
This commit is contained in:
Ulrich Drepper 2008-03-31 18:30:26 +00:00
parent 4e0b2dbe54
commit 3eb9c80984
2 changed files with 16 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2008-03-31 Ulrich Drepper <drepper@redhat.com>
[BZ #6007]
* string/strfry.c: Handle empty strings again.
2008-03-30 Ulrich Drepper <drepper@redhat.com>
[BZ #5443]

View File

@ -26,7 +26,6 @@ strfry (char *string)
{
static int init;
static struct random_data rdata;
size_t len, i;
if (!init)
{
@ -37,17 +36,18 @@ strfry (char *string)
init = 1;
}
len = strlen (string) - 1;
for (i = 0; i < len; ++i)
{
int32_t j;
__random_r (&rdata, &j);
j = j % (len - i) + i;
size_t len = strlen (string);
if (len > 0)
for (size_t i = 0; i < len - 1; ++i)
{
int32_t j;
__random_r (&rdata, &j);
j = j % (len - i) + i;
char c = string[i];
string[i] = string[j];
string[j] = c;
}
char c = string[i];
string[i] = string[j];
string[j] = c;
}
return string;
}