diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2013-10-12 14:07:25 +0200 |
|---|---|---|
| committer | Ondřej Bílka <neleai@seznam.cz> | 2013-10-12 14:32:09 +0200 |
| commit | 9cd8330240f930c5509592cd8d57133e52ac30e7 (patch) | |
| tree | a9a2aa35568c193c2e0379806aba906a7601118e | |
| parent | b7ea74f0747456c99421f14f963082b1dcb6c30d (diff) | |
| download | glibc-9cd8330240f930c5509592cd8d57133e52ac30e7.tar.gz glibc-9cd8330240f930c5509592cd8d57133e52ac30e7.tar.xz glibc-9cd8330240f930c5509592cd8d57133e52ac30e7.zip | |
Fix typo in setlocale.c. Fixes BZ #15764
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | locale/setlocale.c | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index db2c7eb697..1c0d1ef847 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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] diff --git a/NEWS b/NEWS index d617ae74c1..deb7f196a3 100644 --- a/NEWS +++ b/NEWS @@ -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 diff --git a/locale/setlocale.c b/locale/setlocale.c index be95519e9f..e83a156267 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -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; |