This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED] 2.22: Bug 18589: Fix strcoll_l incorrect sorting.
- From: "Carlos O'Donell" <carlos at redhat dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>, libc-stable at sourceware dot org
- Date: Fri, 9 Oct 2015 20:42:15 -0400
- Subject: [COMMITTED] 2.22: Bug 18589: Fix strcoll_l incorrect sorting.
- Authentication-results: sourceware.org; auth=none
I've backported the fix for bug 18589 to 2.22, which is
the only public release with the defect that causes strcoll_l
to incorrectly sort digraphs.
Those of you with distributions based on 2.22 may wish to rebase
to get these changes. They will cause problems with sorting and
are relatively serious.
commit 2b529a82afc15a76185fca16ba7bcc8fbd82d15d
Author: Carlos O'Donell <carlos@systemhalted.org>
Date: Fri Oct 9 16:35:53 2015 -0400
Fix typo in bug-strcoll2 (Bug 18589)
Fix the copyright year and remove contributed by in the
bug-strcoll2 test. In addition add the correct dependency
on $(gen-locales) to ensure all the test locales are generated.
(cherry picked from commit facdd9ea29ab94aac2b188ec3cc41f8733d769e0)
commit c0769d60c1d107d9fb622e80c9d1110deb4fb3b4
Author: Carlos O'Donell <carlos@systemhalted.org>
Date: Thu Oct 8 16:54:30 2015 -0400
strcoll: Add bug-strcoll2 to testsuite (Bug 18589).
Adds bug-strcoll2 to the string tests, along with the
generation of required locales.
(cherry picked from commit 02018629a1397d03eccceacaf2ee1c50e3c4001c)
commit ed7f3a2e27e816488d5a8ef570052a5a2c3c515b
Author: Martin Sebor <msebor@gcc.gnu.org>
Date: Mon Sep 28 16:55:57 2015 -0400
Let 'make check subdirs=string' succeed even when it's invoked
immediately after glibc has been built and before 'make check'
(or after 'make clean').
(cherry picked from commit 60cf80f09d029257caedc0c8abe7e3e09c64e6c7)
commit 6c84109cfa26f35c3dfed3acb97d347361bd5849
Author: Carlos O'Donell <carlos@systemhalted.org>
Date: Thu Oct 8 16:34:53 2015 -0400
strcoll: Remove incorrect STRDIFF-based optimization (Bug 18589).
The optimization introduced in commit
f13c2a8dff2329c6692a80176262ceaaf8a6f74e, causes regressions in
sorting for languages that have digraphs that change sort order, like
cs_CZ which sorts ch between h and i.
My analysis shows the fast-forwarding optimization in STRCOLL advances
through a digraph while possibly stopping in the middle which results
in a subsequent skipping of the digraph and incorrect sorting. The
optimization is incorrect as implemented and because of that I'm
removing it for 2.23, and I will also commit this fix for 2.22 where
it was originally introduced.
This patch reverts the optimization, introduces a new bug-strcoll2.c
regression test that tests both cs_CZ.UTF-8 and da_DK.ISO-8859-1 and
ensures they sort one digraph each correctly. The optimization can't be
applied without regressing this test.
Checked on x86_64, bug-strcoll2.c fails without this patch and passes
after. This will also get a fix on 2.22 which has the same bug.
(cherry picked from commit 87701a58e291bd7ac3b407d10a829dac52c9c16e)
Cheers,
Carlos.