]> granicus.if.org Git - python/commitdiff
disallow a negative idx parameter
authorBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 15:45:21 +0000 (11:45 -0400)
committerBenjamin Peterson <benjamin@python.org>
Mon, 14 Apr 2014 15:45:21 +0000 (11:45 -0400)
Modules/_json.c

index 5bd52cb78988e6f7855936f8800cef747cd65078..4d0f3c473afd3c4f013c4410c519cde0b3ac7d3f 100644 (file)
@@ -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;
     }