From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 14 Apr 2014 15:43:09 +0000 (-0400)
Subject: disallow a negative idx parameter
X-Git-Tag: v2.7.7rc1~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e5d87bb862207eec9165524d9e61feee36a7b27;p=python

disallow a negative idx parameter
---

diff --git a/Modules/_json.c b/Modules/_json.c
index 56d9ee47b9..c91340955a 100644
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -1468,10 +1468,11 @@ scan_once_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *n
     PyObject *res;
     char *str = PyString_AS_STRING(pystr);
     Py_ssize_t length = PyString_GET_SIZE(pystr);
-    if (idx < 0)
-        /* Compatibility with the Python version. */
-        idx += length;
-    if (idx < 0 || idx >= length) {
+    if (idx < 0) {
+        PyErr_SetString(PyExc_ValueError, "idx cannot be negative");
+        return NULL;
+    }
+    if (idx >= length) {
         PyErr_SetNone(PyExc_StopIteration);
         return NULL;
     }
@@ -1558,10 +1559,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 cannot be negative");
+        return NULL;
+    }
+    if (idx >= length) {
         PyErr_SetNone(PyExc_StopIteration);
         return NULL;
     }