OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization

Browse Source 
if N is one bigger than return value.
	* string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
	and l1 last arguments, if buf is defined, verify the return value
	equals to strlen (buf) and verify no byte beyond passed length
	is modified.
This commit is contained in:
Ulrich Drepper 2006-11-10 15:20:59 +00:00
parent 29f34a5bc1
commit 52a33795d3
3 changed files with 57 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2006-11-10 Jakub Jelinek <jakub@redhat.com>
* string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization
if N is one bigger than return value.
* string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1
and l1 last arguments, if buf is defined, verify the return value
equals to strlen (buf) and verify no byte beyond passed length
is modified.
2006-11-10 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.

2
string/strxfrm_l.c
View File

@ -432,7 +432,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l)
if (needed > 2 && needed == last_needed + 1)
{
/* Remove the \1 byte. */
if (--needed < n)
if (--needed <= n)
dest[needed - 1] = L('\0');
}

54
string/tst-strxfrm2.c
View File

@ -7,14 +7,34 @@ do_test (void)
{
int res = 0;
char buf[10];
char buf[20];
size_t l1 = strxfrm (NULL, "ab", 0);
size_t l2 = strxfrm (buf, "ab", 1);
size_t l3 = strxfrm (buf, "ab", sizeof (buf));
if (l1 != l2 || l1 != l3)
if (l3 < sizeof (buf) && strlen (buf) != l3)
{
puts ("C locale test failed");
puts ("C locale l3 test failed");
res = 1;
}
size_t l4 = strxfrm (buf, "ab", l1 + 1);
if (l4 < l1 + 1 && strlen (buf) != l4)
{
puts ("C locale l4 test failed");
res = 1;
}
buf[l1] = 'Z';
size_t l5 = strxfrm (buf, "ab", l1);
if (buf[l1] != 'Z')
{
puts ("C locale l5 test failed");
res = 1;
}
if (l1 != l2 || l1 != l3 || l1 != l4 || l1 != l5)
{
puts ("C locale retval test failed");
res = 1;
}
@ -28,10 +48,30 @@ do_test (void)
l1 = strxfrm (NULL, "ab", 0);
l2 = strxfrm (buf, "ab", 1);
l3 = strxfrm (buf, "ab", sizeof (buf));
if (l1 != l2 || l1 != l3)
if (l3 < sizeof (buf) && strlen (buf) != l3)
{
puts ("UTF-8 locale test failed");
puts ("UTF-8 locale l3 test failed");
res = 1;
}
l4 = strxfrm (buf, "ab", l1 + 1);
if (l4 < l1 + 1 && strlen (buf) != l4)
{
puts ("UTF-8 locale l4 test failed");
res = 1;
}
buf[l1] = 'Z';
l5 = strxfrm (buf, "ab", l1);
if (buf[l1] != 'Z')
{
puts ("UTF-8 locale l5 test failed");
res = 1;
}
if (l1 != l2 || l1 != l3 || l1 != l4 || l1 != l5)
{
puts ("UTF-8 locale retval test failed");
res = 1;
}
}