diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-14 15:48:29 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-14 15:48:29 (GMT) |
| commit | f33201b6dbb700b6d07b25bfeb63deeaf1446419 (patch) | |
| tree | 401c90070caf57c6b5680696a2705aefc1829458 | |
| parent | 07dc55f4c6c0ddfa7c24aadcaf622d213cd946ec (diff) | |
| parent | 70d92a96ab47e0b8b9cb78d437b3761296f815ed (diff) | |
| download | cpython-f33201b6dbb700b6d07b25bfeb63deeaf1446419.zip cpython-f33201b6dbb700b6d07b25bfeb63deeaf1446419.tar.gz cpython-f33201b6dbb700b6d07b25bfeb63deeaf1446419.tar.bz2 | |
merge 3.4
| -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 7d627cb..20f4614 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; } |