From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 22 Apr 2011 22:41:19 +0000 (+0200)
Subject: Issue #9319: Fix a crash on parsing a Python source code without encoding
X-Git-Tag: v3.2.1b1~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c68b6aaec8b08caf682ebb7c95f94ddf49a6b66c;p=thirdparty%2FPython%2Fcpython.git

Issue #9319: Fix a crash on parsing a Python source code without encoding
cookie and not valid in UTF-8: use "<file>" as the filename instead of
reading from NULL.
---

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index d745ae9cc306..6f5b06aa1b18 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -170,6 +170,9 @@ class ImportTests(unittest.TestCase):
                 support.unlink(init_file_name + ext)
             support.rmtree(test_package_name)
 
+    def test_issue9319(self):
+        imp.find_module("test/badsyntax_pep3120")
+
 
 class ReloadTests(unittest.TestCase):
 
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 3f6be2f640ec..5ba12a409d4e 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -586,7 +586,10 @@ decoding_fgets(char *s, int size, struct tok_state *tok)
     if (badchar) {
         /* Need to add 1 to the line number, since this line
            has not been counted, yet.  */
-        filename = PyUnicode_DecodeFSDefault(tok->filename);
+        if (tok->filename != NULL)
+            filename = PyUnicode_DecodeFSDefault(tok->filename);
+        else
+            filename = PyUnicode_FromString("<file>");
         if (filename != NULL) {
             PyErr_Format(PyExc_SyntaxError,
                     "Non-UTF-8 code starting with '\\x%.2x' "