Merged revisions 72314 via svnmerge from

birkenfeld · birkenfeld · commit 596820539f8e · 2009-05-05T07:52:05.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72314 | georg.brandl | 2009-05-05 09:48:12 +0200 (Di, 05 Mai 2009) | 1 line #5932: fix error return in _convertPyInt_AsSsize_t() conversion function. ........
diff --git a/Lib/json/tests/test_scanstring.py b/Lib/json/tests/test_scanstring.py
@@ -102,3 +102,6 @@ def _test_scanstring(self, scanstring):
         self.assertEquals(
             scanstring('["Bad value", truth]', 2, True),
             ('Bad value', 12))
+
+    def test_overflow(self):
+        self.assertRaises(OverflowError, json.decoder.scanstring, b"xxx", sys.maxsize+1)
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -133,9 +133,9 @@ _convertPyInt_AsSsize_t(PyObject *o, Py_ssize_t *size_ptr)
 {
     /* PyObject to Py_ssize_t converter */
     *size_ptr = PyLong_AsSsize_t(o);
-    if (*size_ptr == -1 && PyErr_Occurred());
-        return 1;
-    return 0;
+    if (*size_ptr == -1 && PyErr_Occurred())
+        return 0;
+    return 1;
 }
 
 static PyObject *

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,9 @@ _convertPyInt_AsSsize_t(PyObject o, Py_ssize_t size_ptr)`
`133`	`133`	`{`
`134`	`134`	`/* PyObject to Py_ssize_t converter */`
`135`	`135`	`*size_ptr = PyLong_AsSsize_t(o);`
`136`		`- if (*size_ptr == -1 && PyErr_Occurred());`
`137`		`- return 1;`
`138`		`- return 0;`
	`136`	`+ if (*size_ptr == -1 && PyErr_Occurred())`
	`137`	`+ return 0;`
	`138`	`+ return 1;`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`static PyObject *`