From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 15:45:21 +0000 (-0400)
Subject: disallow a negative idx parameter
X-Git-Tag: 3.1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf74e7588bae7e8d44d8a4c1f6ef37124d270e36;p=thirdparty%2FPython%2Fcpython.git

disallow a negative idx parameter
---

diff --git a/Modules/_json.c b/Modules/_json.c
index e54b0b94bc50..b1c3108cbc0a 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -902,10 +902,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;
     }