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

[benjamin.peterson]

http://hg.python.org/cpython/rev/3a414c709f1f
changeset:   90239:3a414c709f1f
parent:      90233:461f5863f2aa
parent:      90238:7b95540ced5c
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Apr 13 22:32:12 2014 -0400
summary:
  merge 3.4

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
@@ -1373,6 +1373,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
@@ -34,6 +34,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