Fix typo in setlocale.c. Fixes BZ #15764

diff --git a/ChangeLog b/ChangeLog
index db2c7eb697d759be0d798a3afe9eb5b634cf6e56..1c0d1ef847da79f310d7f612d254dab2d3bc7988 100644 (file)
--- 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 d617ae74c1b23a3314a2ec9a41a6b53396d4b1c3..deb7f196a3b52e489b53f74cac5a9eaba7b12dea 100644 (file)
--- 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 be95519e9fb6db37825252c68d5cd19206cd6072..e83a1562679512e711ec908b1352a8ca00b0d691 100644 (file)
--- 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;