diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-12-01 21:51:04 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2009-12-01 21:51:04 (GMT) |
| commit | d728871ee170604e18dd8e0bf1b28b6520a5b809 (patch) | |
| tree | 826b4afa90b41c4033813778be9d571827862acf | |
| parent | 7072f74dc8bea03490ab09af3ee5a902bdc6f284 (diff) | |
| download | cpython-d728871ee170604e18dd8e0bf1b28b6520a5b809.zip cpython-d728871ee170604e18dd8e0bf1b28b6520a5b809.tar.gz cpython-d728871ee170604e18dd8e0bf1b28b6520a5b809.tar.bz2 | |
#7419: Fix a crash on Windows in locale.setlocale() when the category
is outside the allowed range.
| -rw-r--r-- | Lib/test/test_locale.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Modules/_localemodule.c | 8 |
3 files changed, 23 insertions, 1 deletions
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py index d9d3cd9..4510409 100644 --- a/Lib/test/test_locale.py +++ b/Lib/test/test_locale.py @@ -360,6 +360,17 @@ class TestMiscellaneous(unittest.TestCase): # test crasher from bug #3303 self.assertRaises(TypeError, locale.strcoll, u"a", None) + def test_setlocale_category(self): + locale.setlocale(locale.LC_ALL) + locale.setlocale(locale.LC_TIME) + locale.setlocale(locale.LC_CTYPE) + locale.setlocale(locale.LC_COLLATE) + locale.setlocale(locale.LC_MONETARY) + locale.setlocale(locale.LC_NUMERIC) + + # crasher from bug #7419 + self.assertRaises(locale.Error, locale.setlocale, 12345) + def test_main(): tests = [ @@ -12,10 +12,13 @@ What's New in Python 2.7 alpha 1 Core and Builtins ----------------- +- Issue #7419: setlocale() could crash the interpreter on Windows when called + with invalid values. + - Issue #3382: 'F' formatting for float and complex now convert the result to upper case. This only affects 'inf' and 'nan', since 'f' no longer converts to 'g' for large values. - + - Remove switch from "%f" formatting to "%g" formatting for floats larger than 1e50 in absolute value. diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 94d0014..f1f4abf 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -163,6 +163,14 @@ PyLocale_setlocale(PyObject* self, PyObject* args) 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); |