diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-07 15:15:34 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-05-07 15:15:34 (GMT) |
| commit | 06383ee090e3c66130db9dc0b562fba3cb749be1 (patch) | |
| tree | 911f4ebf7e1e6c4e25e7d24bf39925f6ba156f75 | |
| parent | b0b0579625defd7ec370680075fb8ce46db4cd20 (diff) | |
| parent | 362b95102f76d042e7f3865c1ebec5d36c79959a (diff) | |
| download | cpython-06383ee090e3c66130db9dc0b562fba3cb749be1.zip cpython-06383ee090e3c66130db9dc0b562fba3cb749be1.tar.gz cpython-06383ee090e3c66130db9dc0b562fba3cb749be1.tar.bz2 | |
#12017: merge with 3.1.
| -rw-r--r-- | Lib/test/json_tests/test_recursion.py | 12 | ||||
| -rw-r--r-- | Misc/NEWS | 7 | ||||
| -rw-r--r-- | Modules/_json.c | 15 |
3 files changed, 30 insertions, 4 deletions
diff --git a/Lib/test/json_tests/test_recursion.py b/Lib/test/json_tests/test_recursion.py index 1e9b8ab..6d5db50 100644 --- a/Lib/test/json_tests/test_recursion.py +++ b/Lib/test/json_tests/test_recursion.py @@ -65,3 +65,15 @@ class TestRecursion(TestCase): pass else: self.fail("didn't raise ValueError on default recursion") + + + def test_highly_nested_objects(self): + # test that loading highly-nested objects doesn't segfault when C + # accelerations are used. See #12017 + with self.assertRaises(RuntimeError): + json.loads('{"a":' * 100000 + '1' + '}' * 100000) + with self.assertRaises(RuntimeError): + json.loads('{"a":' * 100000 + '[1]' + '}' * 100000) + with self.assertRaises(RuntimeError): + json.loads('[' * 100000 + '1' + ']' * 100000) + @@ -324,8 +324,11 @@ Tools/Demos - Issue #11179: Make ccbench work under Python 3.1 and 2.7 again. -Extensions ----------- +Extension Modules +----------------- + +- Issue #12017: Fix segfault in json.loads() while decoding highly-nested + objects using the C accelerations. - Issue #1838: Prevent segfault in ctypes, when _as_parameter_ on a class is set to an instance of the class. diff --git a/Modules/_json.c b/Modules/_json.c index 75b14ee..dd71003 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -927,6 +927,7 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_ Returns a new PyObject representation of the term. */ + PyObject *res; Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr); Py_ssize_t length = PyUnicode_GET_SIZE(pystr); if (idx >= length) { @@ -941,10 +942,20 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_ next_idx_ptr); case '{': /* object */ - return _parse_object_unicode(s, pystr, idx + 1, next_idx_ptr); + if (Py_EnterRecursiveCall(" while decoding a JSON object " + "from a unicode string")) + return NULL; + res = _parse_object_unicode(s, pystr, idx + 1, next_idx_ptr); + Py_LeaveRecursiveCall(); + return res; case '[': /* array */ - return _parse_array_unicode(s, pystr, idx + 1, next_idx_ptr); + if (Py_EnterRecursiveCall(" while decoding a JSON array " + "from a unicode string")) + return NULL; + res = _parse_array_unicode(s, pystr, idx + 1, next_idx_ptr); + Py_LeaveRecursiveCall(); + return res; case 'n': /* null */ if ((idx + 3 < length) && str[idx + 1] == 'u' && str[idx + 2] == 'l' && str[idx + 3] == 'l') { |