Commit 2f2ed1f3 authored by Victor Stinner's avatar Victor Stinner

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

Fix my previous commit (r85569).
parent 4c7c8c30
...@@ -131,7 +131,12 @@ ast_error_finish(const char *filename) ...@@ -131,7 +131,12 @@ ast_error_finish(const char *filename)
Py_INCREF(Py_None); Py_INCREF(Py_None);
loc = Py_None; loc = Py_None;
} }
filename_obj = PyUnicode_DecodeFSDefault(filename); if (filename != NULL)
filename_obj = PyUnicode_DecodeFSDefault(filename);
else {
Py_INCREF(Py_None);
filename_obj = Py_None;
}
if (filename_obj != NULL) if (filename_obj != NULL)
tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, offset, loc); tmp = Py_BuildValue("(NlOO)", filename_obj, lineno, offset, loc);
else else
......
...@@ -2054,7 +2054,12 @@ err_input(perrdetail *err) ...@@ -2054,7 +2054,12 @@ err_input(perrdetail *err)
errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text), errtext = PyUnicode_DecodeUTF8(err->text, strlen(err->text),
"replace"); "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) if (filename != NULL)
v = Py_BuildValue("(NiiN)", filename, v = Py_BuildValue("(NiiN)", filename,
err->lineno, err->offset, errtext); err->lineno, err->offset, errtext);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment