merge 3.4

f33201b6 · Benjamin Peterson · 07dc55f4 · 70d92a96 · f33201b6
Kaydet (Commit) f33201b6 authored Nis 14, 2014 tarafından Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

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

No files found.
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -941,10 +941,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)
-        /* 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) {
        raise_stop_iteration(idx);
        return NULL;
    }