[Python-checkins] cpython (merge 3.3 -> default): Issue #16975: Fix error handling bug in the escape-decode bytes decoder.

Fri Jan 25 22:44:01 CET 2013

http://hg.python.org/cpython/rev/513b728695fc
changeset: 81740:513b728695fc
parent: 81736:2c0197c95ec6
parent: 81739:580d536cc910
user: Serhiy Storchaka <storchaka at gmail.com>
date: Fri Jan 25 23:33:22 2013 +0200
summary:
 Issue #16975: Fix error handling bug in the escape-decode bytes decoder.
files:
 Lib/test/test_codecs.py | 44 +++++++++++++++++++++++++++++
 Misc/NEWS | 2 +
 Objects/bytesobject.c | 4 ++
 3 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -927,6 +927,50 @@
 def test_empty(self):
 self.assertEqual(codecs.escape_decode(""), (b"", 0))
 
+ def test_raw(self):
+ for b in range(256):
+ if b != b'\\'[0]:
+ self.assertEqual(codecs.escape_decode(bytes([b]) + b'0'),
+ (bytes([b]) + b'0', 2))
+
+ def test_escape(self):
+ self.assertEqual(codecs.escape_decode(b"[\\\n]"), (b"[]", 4))
+ self.assertEqual(codecs.escape_decode(br'[\"]'), (b'["]', 4))
+ self.assertEqual(codecs.escape_decode(br"[\']"), (b"[']", 4))
+ self.assertEqual(codecs.escape_decode(br"[\\]"), (br"[\]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\a]"), (b"[\x07]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\b]"), (b"[\x08]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\t]"), (b"[\x09]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\n]"), (b"[\x0a]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\v]"), (b"[\x0b]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\f]"), (b"[\x0c]", 4))
+ self.assertEqual(codecs.escape_decode(br"[\r]"), (b"[\x0d]", 4))
+ self.assertEqual(codecs.escape_decode(br"[7円]"), (b"[\x07]", 4))
+ self.assertEqual(codecs.escape_decode(br"[8円]"), (br"[8円]", 4))
+ self.assertEqual(codecs.escape_decode(br"[78円]"), (b"[\x078]", 5))
+ self.assertEqual(codecs.escape_decode(br"[41円]"), (b"[!]", 5))
+ self.assertEqual(codecs.escape_decode(br"[418円]"), (b"[!8]", 6))
+ self.assertEqual(codecs.escape_decode(br"[101円]"), (b"[A]", 6))
+ self.assertEqual(codecs.escape_decode(br"[1010円]"), (b"[A0]", 7))
+ self.assertEqual(codecs.escape_decode(br"[501円]"), (b"[A]", 6))
+ self.assertEqual(codecs.escape_decode(br"[\x41]"), (b"[A]", 6))
+ self.assertEqual(codecs.escape_decode(br"[\X41]"), (br"[\X41]", 6))
+ self.assertEqual(codecs.escape_decode(br"[\x410]"), (b"[A0]", 7))
+ for b in range(256):
+ if b not in b'\n"\'\\abtnvfr01234567x':
+ self.assertEqual(codecs.escape_decode(b'\\' + bytes([b])),
+ (b'\\' + bytes([b]), 2))
+
+ def test_errors(self):
+ self.assertRaises(ValueError, codecs.escape_decode, br"\x")
+ self.assertRaises(ValueError, codecs.escape_decode, br"[\x]")
+ self.assertEqual(codecs.escape_decode(br"[\x]\x", "ignore"), (b"[]", 6))
+ self.assertEqual(codecs.escape_decode(br"[\x]\x", "replace"), (b"[?]?", 6))
+ self.assertRaises(ValueError, codecs.escape_decode, br"\x0")
+ self.assertRaises(ValueError, codecs.escape_decode, br"[\x0]")
+ self.assertEqual(codecs.escape_decode(br"[\x0]\x0", "ignore"), (b"[]", 8))
+ self.assertEqual(codecs.escape_decode(br"[\x0]\x0", "replace"), (b"[?]?", 8))
+
 class RecodingTest(unittest.TestCase):
 def test_recoding(self):
 f = io.BytesIO()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
 Core and Builtins
 -----------------
 
+- Issue #16975: Fix error handling bug in the escape-decode bytes decoder.
+
 - Issue #14850: Now a charmap decoder treats U+FFFE as "undefined mapping"
 in any mapping, not only in a string.
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -489,6 +489,10 @@
 errors);
 goto failed;
 }
+ /* skip \x */
+ if (s < end && Py_ISXDIGIT(s[0]))
+ s++; /* and a hexdigit */
+ break;
 default:
 *p++ = '\\';
 s--;
-- 
Repository URL: http://hg.python.org/cpython
