[Python-checkins] cpython (3.2): disallow a negative idx parameter

[benjamin.peterson]

http://hg.python.org/cpython/rev/95d06fc2616b
changeset:   90257:95d06fc2616b
branch:      3.2
parent:      90236:8130b8c06606
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Apr 14 11:45:21 2014 -0400
summary:
  disallow a negative idx parameter

files:
  Modules/_json.c |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -930,10 +930,11 @@
     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;
     }

-- 
Repository URL: http://hg.python.org/cpython