From: Benjamin Peterson Date: Mon, 14 Apr 2014 15:45:21 +0000 (-0400) Subject: disallow a negative idx parameter X-Git-Tag: v3.3.6rc1~16^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ef2b36afa5bf694e343f7227c7fa17fc231121a;p=python disallow a negative idx parameter --- diff --git a/Modules/_json.c b/Modules/_json.c index 5bd52cb789..4d0f3c473a 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; }