diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-16 13:42:53 (GMT) | 
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-10-16 13:42:53 (GMT) | 
| commit | 2f2ed1f36c9413ee2cabed8d8300ee080d85f687 (patch) | |
| tree | 2b70dbd47a564f7dc1b21708c36bc04ff7f3cdaf /Python/pythonrun.c | |
| parent | 4c7c8c30235e42c47500b91549c2b6154b61f883 (diff) | |
| download | cpython-2f2ed1f36c9413ee2cabed8d8300ee080d85f687.zip cpython-2f2ed1f36c9413ee2cabed8d8300ee080d85f687.tar.gz cpython-2f2ed1f36c9413ee2cabed8d8300ee080d85f687.tar.bz2 | |
Fix ast_error_finish() and err_input(): filename can be NULL
Fix my previous commit (r85569).
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 7 | 
1 files changed, 6 insertions, 1 deletions
| diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 8c535fd..f72c9d7 100644 --- 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); | 
