Check for trailing backslash. Fixes #593656.

diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index 3dc7901c0be06271fc5f070263e19dc788a1b874..2294c3dd0f8897b48b193fd79088dd717c86238b 100644 (file)
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -199,6 +199,7 @@ class AbstractPickleTests(unittest.TestCase):
                     "'abc", # quote is not closed
                     "'abc\"", # open quote and close quote don't match
                     "'abc'   ?", # junk after close quote
+                    "'\\'", # trailing backslash
                     # some tests of the quoting rules
                     #"'abc\"\''",
                     #"'\\\\a\'\'\'\\\'\\\\\''",

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