diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-14 15:46:51 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-14 15:46:51 (GMT) |
| commit | 9beee049b0ff72d684e342a5b77bba4fba2df59b (patch) | |
| tree | 3ca5a7e0d0eb5d6729abc76b01f0d2ad62ed3a57 | |
| parent | 156285c35f8ff856883f09394653b000331e3e33 (diff) | |
| parent | 6ef2b36afa5bf694e343f7227c7fa17fc231121a (diff) | |
| download | cpython-9beee049b0ff72d684e342a5b77bba4fba2df59b.zip cpython-9beee049b0ff72d684e342a5b77bba4fba2df59b.tar.gz cpython-9beee049b0ff72d684e342a5b77bba4fba2df59b.tar.bz2 | |
merge 3.2
| -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 ec980c9..4bc585d 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -975,10 +975,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) { PyErr_SetNone(PyExc_StopIteration); return NULL; } |