Fix ast_error_finish() and err_input(): filename can be NULL

Fix my previous commit (r85569).
2010-10-16 13:42:53 +00:00
parent 4c7c8c3023
commit 2f2ed1f36c
2 changed files with 12 additions and 2 deletions
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -2054,7 +2054,12 @@ err_input(perrdetail *err)
        errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text),
                                       "replace");
    }
-    filename = PyUnicode_DecodeFSDefault(err->filename);
+    if (err->filename != NULL)
+        filename = PyUnicode_DecodeFSDefault(err->filename);
+    else {
+        Py_INCREF(Py_None);
+        filename = Py_None;
+    }
    if (filename != NULL)
        v = Py_BuildValue("(NiiN)", filename,
                          err->lineno, err->offset, errtext);