Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-31825: Fixed OverflowError in the 'unicode-escape' codec (#4058) 

and in codecs.escape_decode() when decode an escaped non-ascii byte.
This commit is contained in:
Serhiy Storchaka 2017-10-20 17:08:15 +03:00 committed by GitHub
parent 525f40d231
commit 56cb465cc9
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_codecs.py
View File

@ -1203,6 +1203,8 @@ class EscapeDecodeTest(unittest.TestCase):
check(br"\8", b"\\8")
with self.assertWarns(DeprecationWarning):
check(br"\9", b"\\9")
with self.assertWarns(DeprecationWarning):
check(b"\\\xfa", b"\\\xfa")
def test_errors(self):
decode = codecs.escape_decode
@ -2474,6 +2476,8 @@ class UnicodeEscapeTest(unittest.TestCase):
check(br"\8", "\\8")
with self.assertWarns(DeprecationWarning):
check(br"\9", "\\9")
with self.assertWarns(DeprecationWarning):
check(b"\\\xfa", "\\\xfa")
def test_decode_errors(self):
decode = codecs.unicode_escape_decode

2
Misc/NEWS.d/next/Core and Builtins/2017-10-20-14-07-46.bpo-31825.gJvmGW.rst Normal file
View File

@ -0,0 +1,2 @@
Fixed OverflowError in the 'unicode-escape' codec and in
codecs.escape_decode() when decode an escaped non-ascii byte.

2
Objects/bytesobject.c
View File

@ -1257,7 +1257,7 @@ PyObject *PyBytes_DecodeEscape(const char *s,
if (first_invalid_escape != NULL) {
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
"invalid escape sequence '\\%c'",
*first_invalid_escape) < 0) {
(unsigned char)*first_invalid_escape) < 0) {
Py_DECREF(result);
return NULL;
}

2
Objects/unicodeobject.c
View File

@ -6136,7 +6136,7 @@ PyUnicode_DecodeUnicodeEscape(const char *s,
if (first_invalid_escape != NULL) {
if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
"invalid escape sequence '\\%c'",
*first_invalid_escape) < 0) {
(unsigned char)*first_invalid_escape) < 0) {
Py_DECREF(result);
return NULL;
}

2
Python/ast.c
View File

@ -4147,7 +4147,7 @@ decode_utf8(struct compiling *c, const char **sPtr, const char *end)
static int
warn_invalid_escape_sequence(struct compiling *c, const node *n,
char first_invalid_escape_char)
unsigned char first_invalid_escape_char)
{
PyObject *msg = PyUnicode_FromFormat("invalid escape sequence \\%c",
first_invalid_escape_char);