diff options
| -rw-r--r-- | Lib/test/test_unicodedata.py | 27 | ||||
| -rw-r--r-- | Python/ast.c | 3 |
2 files changed, 27 insertions, 3 deletions
diff --git a/Lib/test/test_unicodedata.py b/Lib/test/test_unicodedata.py index 6edda3a..2dfa807 100644 --- a/Lib/test/test_unicodedata.py +++ b/Lib/test/test_unicodedata.py @@ -4,9 +4,13 @@ (c) Copyright CNRI, All Rights Reserved. NO WARRANTY. -"""#" -import unittest, test.support +""" + +import sys +import unittest import hashlib +import subprocess +import test.support encoding = 'utf-8' @@ -197,6 +201,25 @@ class UnicodeFunctionsTest(UnicodeDatabaseTest): class UnicodeMiscTest(UnicodeDatabaseTest): + def test_failed_import_during_compiling(self): + # Issue 4367 + # Decoding \N escapes requires the unicodedata module. If it can't be + # imported, we shouldn't segfault. + + # This program should raise a SyntaxError in the eval. + code = "import sys;" \ + "sys.modules['unicodedata'] = None;" \ + """eval("'\\\\N{SOFT HYPHEN}'")""" + args = [sys.executable, "-c", code] + # We use a subprocess because the unicodedata module may already have + # been loaded in this process. + popen = subprocess.Popen(args, stderr=subprocess.PIPE) + popen.wait() + self.assertEqual(popen.returncode, 1) + error = "SyntaxError: (unicode error) \\N escapes not supported " \ + "(can't load unicodedata module)" + self.assertTrue(error in popen.stderr.read().decode("ascii")) + def test_decimal_numeric_consistent(self): # Test that decimal and numeric are consistent, # i.e. if a character has a decimal value, diff --git a/Python/ast.c b/Python/ast.c index 1cf100e..df94850 100644 --- a/Python/ast.c +++ b/Python/ast.c @@ -1321,13 +1321,14 @@ ast_for_atom(struct compiling *c, const node *n) if (PyErr_ExceptionMatches(PyExc_UnicodeError)) { PyObject *type, *value, *tback, *errstr; PyErr_Fetch(&type, &value, &tback); - errstr = ((PyUnicodeErrorObject *)value)->reason; + errstr = PyObject_Str(value); if (errstr) { char *s = ""; char buf[128]; s = _PyUnicode_AsString(errstr); PyOS_snprintf(buf, sizeof(buf), "(unicode error) %s", s); ast_error(n, buf); + Py_DECREF(errstr); } else { ast_error(n, "(unicode error) unknown error"); } |