From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 25 Feb 2007 16:19:21 +0000 (+0000)
Subject: Backport 53901 and 53902 to prevent crash when there is an error decoding unicode... 
X-Git-Tag: v2.5.1c1~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a5f5f147834419c9c2c76b468c16d83f68fc1102;p=python

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 92c7e7c061..9a46c4255d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.
 
diff --git a/Python/ceval.c b/Python/ceval.c
index 7884051ffb..1ee0f3b603 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -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,