commit ea315ac8f4890538ad23c5247c2cc7dfa7e9f985
author Amaury Forgeot d'Arc <amauryfa@gmail.com> Tue Dec 01 22:03:44 2009 +0000
committer Amaury Forgeot d'Arc <amauryfa@gmail.com> Tue Dec 01 22:03:44 2009 +0000
tree 1998254f0bcbed54e4a26f8d876dc3579db0e30c
parent 6c8ee7a33309b79d9f2737616501835349cfcdaf

Merged revisions 76626 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76626 | amaury.forgeotdarc | 2009-12-01 22:59:18 +0100 (mar., 01 déc. 2009) | 10 lines

  Merged revisions 76625 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76625 | amaury.forgeotdarc | 2009-12-01 22:51:04 +0100 (mar., 01 déc. 2009) | 3 lines

    #7419: Fix a crash on Windows in locale.setlocale() when the category
    is outside the allowed range.
  ........
................

Modules/_localemodule.c

diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index fa6ab8f..aabc3ac 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -133,6 +133,14 @@
     if (!PyArg_ParseTuple(args, "i|z:setlocale", &category, &locale))
         return NULL;
 
+#if defined(MS_WINDOWS)
+    if (category < LC_MIN || category > LC_MAX)
+    {
+        PyErr_SetString(Error, "invalid locale category");
+        return NULL;
+    }
+#endif
+
     if (locale) {
         /* set locale */
         result = setlocale(category, locale);