Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
........
This commit is contained in:
Georg Brandl 2009-05-05 07:52:05 +00:00
parent 011e842033
commit 596820539f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/json/tests/test_scanstring.py
View File

@ -102,3 +102,6 @@ class TestScanString(TestCase):
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)

6
Modules/_json.c
View File

@ -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 *