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
........
This commit is contained in:
Benjamin Peterson 2008-11-21 22:58:57 +00:00
parent 4a98a2a57b
commit 6f7fad16bc
2 changed files with 27 additions and 3 deletions

View file

@ -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");
}