Kaydet (Commit) a5f5f147 authored tarafından Neal Norwitz's avatar Neal Norwitz

Backport 53901 and 53902 to prevent crash when there is an error decoding unicode filenames

üst d621a6e8
......@@ -124,6 +124,8 @@ Extension Modules
- The version number of the ctypes package was changed to "1.0.2".
- Bug #1664966: Fix crash in exec if Unicode filename can't be decoded.
- Patch #1544279: Improve thread-safety of the socket module by moving
the sock_addr_t storage out of the socket object.
......
......@@ -4173,6 +4173,8 @@ exec_statement(PyFrameObject *f, PyObject *prog, PyObject *globals,
FILE *fp = PyFile_AsFile(prog);
char *name = PyString_AsString(PyFile_Name(prog));
PyCompilerFlags cf;
if (name == NULL)
return -1;
cf.cf_flags = 0;
if (PyEval_MergeCompilerFlags(&cf))
v = PyRun_FileFlags(fp, name, Py_file_input, globals,
......
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