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

Check for trailing backslash. Fixes #593656.

This commit is contained in:
Martin v. Löwis 2002-08-14 08:22:50 +00:00
parent 8a8da798a5
commit eb3f00aeeb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Lib/test/pickletester.py
View File

@ -199,6 +199,7 @@ class AbstractPickleTests(unittest.TestCase):
"'abc", # quote is not closed "'abc", # quote is not closed
"'abc\"", # open quote and close quote don't match "'abc\"", # open quote and close quote don't match
"'abc' ?", # junk after close quote "'abc' ?", # junk after close quote
"'\\'", # trailing backslash
# some tests of the quoting rules # some tests of the quoting rules
#"'abc\"\''", #"'abc\"\''",
#"'\\\\a\'\'\'\\\'\\\\\''", #"'\\\\a\'\'\'\\\'\\\\\''",

13
Objects/stringobject.c
View File

@ -546,6 +546,11 @@ PyObject *PyString_DecodeEscape(const char *s,
continue; continue;
} }
s++; s++;
if (s==end) {
PyErr_SetString(PyExc_ValueError,
"Trailing \\ in string");
goto failed;
}
switch (*s++) { switch (*s++) {
/* XXX This assumes ASCII! */ /* XXX This assumes ASCII! */
case '\n': break; case '\n': break;
@ -594,10 +599,9 @@ PyObject *PyString_DecodeEscape(const char *s,
break; break;
} }
if (!errors || strcmp(errors, "strict") == 0) { if (!errors || strcmp(errors, "strict") == 0) {
Py_DECREF(v);
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"invalid \\x escape"); "invalid \\x escape");
return NULL; goto failed;
} }
if (strcmp(errors, "replace") == 0) { if (strcmp(errors, "replace") == 0) {
*p++ = '?'; *p++ = '?';
@ -608,18 +612,17 @@ PyObject *PyString_DecodeEscape(const char *s,
"decoding error; " "decoding error; "
"unknown error handling code: %.400s", "unknown error handling code: %.400s",
errors); errors);
return NULL; goto failed;
} }
#ifndef Py_USING_UNICODE #ifndef Py_USING_UNICODE
case 'u': case 'u':
case 'U': case 'U':
case 'N': case 'N':
if (unicode) { if (unicode) {
Py_DECREF(v);
com_error(com, PyExc_ValueError, com_error(com, PyExc_ValueError,
"Unicode escapes not legal " "Unicode escapes not legal "
"when Unicode disabled"); "when Unicode disabled");
return NULL; goto failed;
} }
#endif #endif
default: default: