diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-14 15:45:21 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-14 15:45:21 (GMT) |
| commit | 6ef2b36afa5bf694e343f7227c7fa17fc231121a (patch) | |
| tree | 8788c1632bbd33b3a7956809cf2d1be88d312508 | |
| parent | 99b5afab74428e5ddfd877bdf3aa8a8c479696b1 (diff) | |
| download | cpython-6ef2b36afa5bf694e343f7227c7fa17fc231121a.zip cpython-6ef2b36afa5bf694e343f7227c7fa17fc231121a.tar.gz cpython-6ef2b36afa5bf694e343f7227c7fa17fc231121a.tar.bz2 | |
disallow a negative idx parameter
| -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 5bd52cb..4d0f3c4 100644 --- a/Modules/_json.c +++ b/Modules/_json.c @@ -930,10 +930,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_ PyObject *res; Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr); Py_ssize_t length = PyUnicode_GET_SIZE(pystr); - if (idx < 0) - /* Compatibility with Python version. */ - idx += length; - if (idx < 0 || idx >= length) { + if (idx < 0) { + PyErr_SetString(PyExc_ValueError, "idx canont be negative"); + return NULL; + } + if (idx >= length) { PyErr_SetNone(PyExc_StopIteration); return NULL; } |