AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 19:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo in setlocale.c. Fixes BZ #15764

Browse Source
This commit is contained in:
Reuben Thomas 2013-10-12 14:07:25 +02:00 committed by Ondřej Bílka
parent b7ea74f074
commit 9cd8330240
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-12 Reuben Thomas <rrt@sc3d.org>
[BZ #15764]
* locale/setlocale.c: Fix typo.
2013-10-12 Joseph Myers <joseph@codesourcery.com>
[BZ #16036]

9
NEWS
View File

@ -11,10 +11,11 @@ Version 2.19
156, 431, 13982, 13985, 14155, 14547, 14699, 14910, 15048, 15362, 15400,
15427, 15522, 15531, 15532, 15608, 15609, 15610, 15632, 15640, 15680,
15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15797,
15844, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, 15890,
15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, 15939,
15963, 15966, 15988, 16032, 16034, 16036.
15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764,
15797, 15844, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887,
15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923,
15939, 15963, 15966, 15988, 16032, 16034, 16036.
* CVE-2012-4412 The strcoll implementation caches indices and rules for
large collation sequences to optimize multiple passes. This cache

2
locale/setlocale.c
View File

@ -412,7 +412,7 @@ setlocale (int category, const char *locale)
/* We must not simply free a global locale since we have no
control over the usage. So we mark it as un-deletable.
Note: do not remove the `if', it's necessary to copy with
Note: do not remove the `if', it's necessary to cope with
the builtin locale data. */
if (newdata->usage_count != UNDELETABLE)
newdata->usage_count = UNDELETABLE;