From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13769 invoked by alias); 10 Nov 2006 08:51:15 -0000 Received: (qmail 13700 invoked by uid 22791); 10 Nov 2006 08:51:14 -0000 X-Spam-Check-By: sourceware.org Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26) by sourceware.org (qpsmtpd/0.31) with ESMTP; Fri, 10 Nov 2006 08:51:05 +0000 Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id kAA8otYk011253; Fri, 10 Nov 2006 09:50:55 +0100 Received: (from jj@localhost) by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id kAA8ot7t011252; Fri, 10 Nov 2006 09:50:55 +0100 Date: Fri, 10 Nov 2006 08:51:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix strxfrm fix Message-ID: <20061110085054.GN5868@sunsite.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sourceware.org X-SW-Source: 2006-11/txt/msg00009.txt.bz2 Hi! As the attached testcase shows (found when testing on i486 in sort-test, but it didn't show up on any other arch), I messed up the test when to terminate the string. We store at needed - 1, so even if --needed == n needed - 1 is < n and therefore the returned string is valid. Sorry. 2006-11-10 Jakub Jelinek * 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. --- libc/string/strxfrm_l.c 9 Nov 2006 20:17:42 -0000 1.6 +++ libc/string/strxfrm_l.c 10 Nov 2006 08:45:07 -0000 @@ -432,7 +432,7 @@ STRXFRM (STRING_TYPE *dest, const STRING if (needed > 2 && needed == last_needed + 1) { /* Remove the \1 byte. */ - if (--needed < n) + if (--needed <= n) dest[needed - 1] = L('\0'); } --- libc/string/tst-strxfrm2.c 9 Nov 2006 20:18:54 -0000 1.1 +++ libc/string/tst-strxfrm2.c 10 Nov 2006 08:45:07 -0000 @@ -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 (l3 < sizeof (buf) && strlen (buf) != l3) + { + 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) + if (l1 != l2 || l1 != l3 || l1 != l4 || l1 != l5) { - puts ("C locale test failed"); + 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 (l3 < sizeof (buf) && strlen (buf) != l3) + { + 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) + if (l1 != l2 || l1 != l3 || l1 != l4 || l1 != l5) { - puts ("UTF-8 locale test failed"); + puts ("UTF-8 locale retval test failed"); res = 1; } } Jakub