disallow a negative idx parameter

4c18840b · Benjamin Peterson · 7b0ea78c · 4c18840b
Commit 4c18840b authored Apr 14, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

Modules/_json.c Modules/_json.c +5 -4

No files found.
--- 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)
+    if (idx < 0) {
-        /* Compatibility with Python version. */
+        PyErr_SetString(PyExc_ValueError, "idx canont be negative");
-        idx += length;
+        return NULL;
-    if (idx < 0 || idx >= length) {
+    }
+    if (idx >= length) {
        PyErr_SetNone(PyExc_StopIteration);
        return NULL;
    }