diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-01-12 18:02:24 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-01-12 18:02:24 +0000 |
| commit | 2d54f6629ee35529977ac7d742ab0c8f2c1c28a0 (patch) | |
| tree | 6f5b4980d7e0b2db21fe086bf722c37facc534e7 /string/strxfrm_l.c | |
| parent | cf7056af7bc2447fbf90f6a1fc442710c61d3f8d (diff) | |
| download | glibc-2d54f6629ee35529977ac7d742ab0c8f2c1c28a0.tar glibc-2d54f6629ee35529977ac7d742ab0c8f2c1c28a0.tar.gz glibc-2d54f6629ee35529977ac7d742ab0c8f2c1c28a0.tar.bz2 glibc-2d54f6629ee35529977ac7d742ab0c8f2c1c28a0.zip | |
* string/Makefile (tst-strxfrm2-ENV): Define.
* 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.
* string/Makefile (tests): Add tst-strxfrm2.
* string/tst-strxfrm2.c: New file.
* string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal
optimization even if needed > n.
Diffstat (limited to 'string/strxfrm_l.c')
| -rw-r--r-- | string/strxfrm_l.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/string/strxfrm_l.c b/string/strxfrm_l.c index 5335601919..20f2f149bd 100644 --- a/string/strxfrm_l.c +++ b/string/strxfrm_l.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1995,96,97,2002, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2002, 2004, 2005, 2006 + Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -96,6 +97,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) const int32_t *indirect; uint_fast32_t pass; size_t needed; + size_t last_needed; const USTRING_TYPE *usrc; size_t srclen = STRLEN (src); int32_t *idxarr; @@ -197,6 +199,7 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) this is true for all of them. */ int position = rule & sort_position; + last_needed = needed; if (position == 0) { for (idxcnt = 0; idxcnt < idxmax; ++idxcnt) @@ -426,11 +429,11 @@ STRXFRM (STRING_TYPE *dest, const STRING_TYPE *src, size_t n, __locale_t l) a `position' rule at the end and if no non-ignored character is found the last \1 byte is immediately followed by a \0 byte signalling this. We can avoid the \1 byte(s). */ - if (needed <= n && needed > 2 && dest[needed - 2] == L('\1')) + if (needed > 2 && needed == last_needed + 1) { /* Remove the \1 byte. */ - --needed; - dest[needed - 1] = L('\0'); + if (--needed <= n) + dest[needed - 1] = L('\0'); } /* Free the memory if needed. */ |