From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 18 Aug 2012 18:46:23 +0000 (+0200)
Subject: Issue #15615: Add some tests for the json module's handling of invalid input data.
X-Git-Tag: v3.3.0rc1~81^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b47ea9a6fef77a472665d21d04904f754dc7d55f;p=thirdparty%2FPython%2Fcpython.git

Issue #15615: Add some tests for the json module's handling of invalid input data.
Patch by Kushal Das.
---

diff --git a/Lib/test/json_tests/test_decode.py b/Lib/test/json_tests/test_decode.py
index 9fbaa3bdf89b..4f7896e21fe3 100644
--- a/Lib/test/json_tests/test_decode.py
+++ b/Lib/test/json_tests/test_decode.py
@@ -54,6 +54,15 @@ class TestDecode:
         self.check_keys_reuse(s, self.loads)
         self.check_keys_reuse(s, self.json.decoder.JSONDecoder().decode)
 
+    def test_extra_data(self):
+        s = '[1, 2, 3]5'
+        msg = 'Extra data'
+        self.assertRaisesRegexp(ValueError, msg, self.loads, s)
+
+    def test_invalid_escape(self):
+        s = '["abc\\y"]'
+        msg = 'escape'
+        self.assertRaisesRegexp(ValueError, msg, self.loads, s)
 
 class TestPyDecode(TestDecode, PyTest): pass
 class TestCDecode(TestDecode, CTest): pass
diff --git a/Misc/ACKS b/Misc/ACKS
index c3c59dee29d6..2e72f22592cd 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -218,6 +218,7 @@ Evan Dandrea
 Eric Daniel
 Scott David Daniels
 Ben Darnell
+Kushal Das
 Jonathan Dasteel
 John DeGood
 Ned Deily
diff --git a/Misc/NEWS b/Misc/NEWS
index 8fdd51534c2c..86b178b64c1b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -425,6 +425,9 @@ Extension Modules
 Tests
 -----
 
+- Issue #15615: Add some tests for the json module's handling of invalid
+  input data.  Patch by Kushal Das.
+
 - Issue #15496: Add directory removal helpers for tests on Windows.
   Patch by Jeremy Kloth.