merge 3.2

9beee049 · Benjamin Peterson · 156285c3 · 6ef2b36a · 9beee049
Commit 9beee049 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
@@ -975,10 +975,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_
    kind = PyUnicode_KIND(pystr);
    length = PyUnicode_GET_LENGTH(pystr);
-    if (idx < 0)
+    if (idx < 0) {
-        /* Compatibility with Python version. */
+        PyErr_SetString(PyExc_ValueError, "idx cannot be negative");
-        idx += length;
+        return NULL;
-    if (idx < 0 || idx >= length) {
+    }
+    if (idx >= length) {
        PyErr_SetNone(PyExc_StopIteration);
        return NULL;
    }