in scan_once, prevent the reading of arbitrary memory when passed a negative index

benjaminp · benjaminp · commit 66a316837c31 · 2014-04-13T22:10:38.000-04:00
Bug reported by Guido Vranken.
diff --git a/Lib/json/tests/test_decode.py b/Lib/json/tests/test_decode.py
@@ -45,5 +45,9 @@ def test_decoder_optimizations(self):
         self.assertEqual(rval, {"key":"value", "k":"v"})
 
 
+    def test_negative_index(self):
+        d = self.json.JSONDecoder()
+        self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
+
 class TestPyDecode(TestDecode, PyTest): pass
 class TestCDecode(TestDecode, CTest): pass
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -842,6 +842,7 @@ Kannan Vijayan
 Kurt Vile
 Norman Vine
 Frank Visser
+Guido Vranken
 Niki W. Waibel
 Wojtek Walczak
 Charles Waldman
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -13,6 +13,9 @@ Core and Builtins
 Library
 -------
 
+- Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
+  parameter. Bug reported by Guido Vranken.
+
 - Issue #20246: Fix buffer overflow in socket.recvfrom_into.
 
 - Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -902,7 +902,10 @@ 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 >= length) {
+    if (idx < 0)
+        /* Compatibility with Python version. */
+        idx += length;
+    if (idx < 0 || idx >= length) {
         PyErr_SetNone(PyExc_StopIteration);
         return NULL;
     }
