diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-11-21 22:58:57 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-11-21 22:58:57 (GMT) |
| commit | 6f7fad16bc2799c3db0e96d4c4ad35676d59251c (patch) | |
| tree | 13da6f70da9f002797bebe50f00fe1943de6ebb8 /Python | |
| parent | 4a98a2a57b85447e1a7b1c89920d6eb476027fd0 (diff) | |
| download | cpython-6f7fad16bc2799c3db0e96d4c4ad35676d59251c.zip cpython-6f7fad16bc2799c3db0e96d4c4ad35676d59251c.tar.gz cpython-6f7fad16bc2799c3db0e96d4c4ad35676d59251c.tar.bz2 | |
Merged revisions 67320 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67320 | benjamin.peterson | 2008-11-21 16:27:24 -0600 (Fri, 21 Nov 2008) | 4 lines
don't segfault when \N escapes are used and unicodedata fails to load
Fixes #4367
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ast.c | 3 |
1 files changed, 2 insertions, 1 deletions
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"); } |