commit 596820539f8e776cfb790573298c62fae319c67f
author Georg Brandl <georg@python.org> Tue May 05 07:52:05 2009 +0000
committer Georg Brandl <georg@python.org> Tue May 05 07:52:05 2009 +0000
tree 1f8eee8fb01bf10bd1febce0001ae0ae20bfcce5
parent 011e8420339245f9b55d41082ec6036f2f83a182

Merged revisions 72314 via svnmerge from
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.
........

Lib/json/tests/test_scanstring.py

diff --git a/Lib/json/tests/test_scanstring.py b/Lib/json/tests/test_scanstring.py
index 2d55672..2e9136b 100644
--- a/Lib/json/tests/test_scanstring.py
+++ b/Lib/json/tests/test_scanstring.py
@@ -102,3 +102,6 @@
         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)

Modules/_json.c

diff --git a/Modules/_json.c b/Modules/_json.c
index 45f4b58..c44dbac 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -133,9 +133,9 @@
 {
     /* 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 *