diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-04-14 11:48:21 -0400 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-04-14 11:48:21 -0400 |
commit | 936ea19c9a8b56426634c73db80a15d4b3cd350a (patch) | |
tree | d8e56dde30015eda43dee6a2d6bc43e71efab646 /Modules | |
parent | 5605b40c33382bf1eccaa27bc0f8aa138f7c10a4 (diff) | |
parent | 7a94319d434dec81571925b7a9d9312c08a8c483 (diff) | |
download | cpython-936ea19c9a8b56426634c73db80a15d4b3cd350a.tar.gz |
merge 3.3
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_json.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Modules/_json.c b/Modules/_json.c index 7d627cb2c5..20f4614c7d 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -941,10 +941,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_ kind = PyUnicode_KIND(pystr); length = PyUnicode_GET_LENGTH(pystr); - if (idx < 0) - /* Compatibility with Python version. */ - idx += length; - if (idx < 0 || idx >= length) { + if (idx < 0) { + PyErr_SetString(PyExc_ValueError, "idx cannot be negative"); + return NULL; + } + if (idx >= length) { raise_stop_iteration(idx); return NULL; } |