[Python-checkins] cpython (merge 3.3 -> 3.4): merge 3.3

benjamin.peterson python-checkins at python.org
Mon Apr 14 04:32:25 CEST 2014


http://hg.python.org/cpython/rev/7b95540ced5c
changeset:   90238:7b95540ced5c
branch:      3.4
parent:      90232:f430fdd1628e
parent:      90237:4f15bd1ab28f
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Apr 13 22:31:42 2014 -0400
summary:
  merge 3.3

files:
  Lib/test/test_json/test_decode.py |  4 ++++
  Misc/ACKS                         |  1 +
  Misc/NEWS                         |  3 +++
  Modules/_json.c                   |  5 ++++-
  4 files changed, 12 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_json/test_decode.py b/Lib/test/test_json/test_decode.py
--- a/Lib/test/test_json/test_decode.py
+++ b/Lib/test/test_json/test_decode.py
@@ -91,5 +91,9 @@
         self.assertEqual(self.loads(bom_in_str), '\ufeff')
         self.assertEqual(self.json.load(StringIO(bom_in_str)), '\ufeff')
 
+    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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1372,6 +1372,7 @@
 Alex Volkov
 Martijn Vries
 Sjoerd de Vries
+Guido Vranken
 Niki W. Waibel
 Wojtek Walczak
 Charles Waldman
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@
 Library
 -------
 
+- Fix arbitrary memory access in JSONDecoder.raw_decode with a negative second
+  parameter. Bug reported by Guido Vranken.
+
 - Issue #21169: getpass now handles non-ascii characters that the
   input stream encoding cannot encode by re-encoding using the
   replace error handler.
diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -941,7 +941,10 @@
     kind = PyUnicode_KIND(pystr);
     length = PyUnicode_GET_LENGTH(pystr);
 
-    if (idx >= length) {
+    if (idx < 0)
+        /* Compatibility with Python version. */
+        idx += length;
+    if (idx < 0 || idx >= length) {
         raise_stop_iteration(idx);
         return NULL;
     }

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


More information about the Python-checkins mailing list