Mercurial > cpython-lru_cache-weakref
comparison Python/pythonrun.c @ 65400:9ed68dd6b71f
Fix ast_error_finish() and err_input(): filename can be NULL
Fix my previous commit (r85569).
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Sat, 16 Oct 2010 13:42:53 +0000 |
| parents | 55ed5c524428 |
| children | fd5135cbd928 |
comparison
equal
deleted
inserted
replaced
| 65399:55ed5c524428 | 65400:9ed68dd6b71f |
|---|---|
| 2052 Py_INCREF(Py_None); | 2052 Py_INCREF(Py_None); |
| 2053 } else { | 2053 } else { |
| 2054 errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text), | 2054 errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text), |
| 2055 "replace"); | 2055 "replace"); |
| 2056 } | 2056 } |
| 2057 filename = PyUnicode_DecodeFSDefault(err->filename); | 2057 if (err->filename != NULL) |
| 2058 filename = PyUnicode_DecodeFSDefault(err->filename); | |
| 2059 else { | |
| 2060 Py_INCREF(Py_None); | |
| 2061 filename = Py_None; | |
| 2062 } | |
| 2058 if (filename != NULL) | 2063 if (filename != NULL) |
| 2059 v = Py_BuildValue("(NiiN)", filename, | 2064 v = Py_BuildValue("(NiiN)", filename, |
| 2060 err->lineno, err->offset, errtext); | 2065 err->lineno, err->offset, errtext); |
| 2061 else | 2066 else |
| 2062 v = NULL; | 2067 v = NULL; |
