changeset:   90234:50c07ed1743d
branch:      2.7
parent:      90224:218e28a935ab
user:        Benjamin Peterson <benjamin@python.org>
date:        Sun Apr 13 22:10:38 2014 -0400
files:       Lib/json/tests/test_decode.py Misc/ACKS Misc/NEWS Modules/_json.c
description:
in scan_once, prevent the reading of arbitrary memory when passed a negative index

Bug reported by Guido Vranken.


diff -r 218e28a935ab -r 50c07ed1743d Lib/json/tests/test_decode.py
--- a/Lib/json/tests/test_decode.py	Sat Apr 12 09:31:28 2014 -0700
+++ b/Lib/json/tests/test_decode.py	Sun Apr 13 22:10:38 2014 -0400
@@ -60,5 +60,10 @@
         msg = 'escape'
         self.assertRaisesRegexp(ValueError, msg, self.loads, s)
 
+    def test_negative_index(self):
+        d = self.json.JSONDecoder()
+        self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
+        self.assertRaises(ValueError, d.raw_decode, u'a'*42, -50000)
+
 class TestPyDecode(TestDecode, PyTest): pass
 class TestCDecode(TestDecode, CTest): pass
diff -r 218e28a935ab -r 50c07ed1743d Misc/ACKS
--- a/Misc/ACKS	Sat Apr 12 09:31:28 2014 -0700
+++ b/Misc/ACKS	Sun Apr 13 22:10:38 2014 -0400
@@ -1369,6 +1369,7 @@
 Frank Visser
 Johannes Vogel
 Alex Volkov
+Guido Vranken
 Martijn Vries
 Sjoerd de Vries
 Niki W. Waibel
diff -r 218e28a935ab -r 50c07ed1743d Misc/NEWS
--- a/Misc/NEWS	Sat Apr 12 09:31:28 2014 -0700
+++ b/Misc/NEWS	Sun Apr 13 22:10:38 2014 -0400
@@ -43,6 +43,9 @@
 Library
 -------
 
+- Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
+  parameter. Bug reported by Guido Vranken.
+
 - Issue #21172: isinstance check relaxed from dict to collections.Mapping.
 
 - Issue #21191: In os.fdopen, alwyas close the file descriptor when an exception
diff -r 218e28a935ab -r 50c07ed1743d Modules/_json.c
--- a/Modules/_json.c	Sat Apr 12 09:31:28 2014 -0700
+++ b/Modules/_json.c	Sun Apr 13 22:10:38 2014 -0400
@@ -1468,7 +1468,10 @@
     PyObject *res;
     char *str = PyString_AS_STRING(pystr);
     Py_ssize_t length = PyString_GET_SIZE(pystr);
-    if (idx >= length) {
+    if (idx < 0)
+        /* Compatibility with the Python version. */
+        idx += length;
+    if (idx < 0 || idx >= length) {
         PyErr_SetNone(PyExc_StopIteration);
         return NULL;
     }
@@ -1555,7 +1558,10 @@
     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;
     }