mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-08 10:58:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 67320 via svnmerge from

Browse source 
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:52:21 +00:00
parent 42491ce09c
commit 71ce9e7ba4
3 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Python/ast.c
View file

@ -1287,13 +1287,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 = PyString_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");
}