From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 6 Oct 2011 00:34:51 +0000 (+0200)
Subject: Fix _warnings.c: make the filename string ready
X-Git-Tag: v3.3.0a1~1296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b62a7b268af8d58e5565b44a38c923917d7b62fe;p=thirdparty%2FPython%2Fcpython.git

Fix _warnings.c: make the filename string ready
---

diff --git a/Python/_warnings.c b/Python/_warnings.c
index 2bcca91fa650..792e3ed6df12 100644
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -497,9 +497,16 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
     /* Setup filename. */
     *filename = PyDict_GetItemString(globals, "__file__");
     if (*filename != NULL && PyUnicode_Check(*filename)) {
-        Py_ssize_t len = PyUnicode_GetSize(*filename);
-        int kind = PyUnicode_KIND(*filename);
-        void *data = PyUnicode_DATA(*filename);
+        Py_ssize_t len;
+        int kind;
+        void *data;
+
+        if (PyUnicode_READY(*filename))
+            goto handle_error;
+
+        len = PyUnicode_GetSize(*filename);
+        kind = PyUnicode_KIND(*filename);
+        data = PyUnicode_DATA(*filename);
 
         /* if filename.lower().endswith((".pyc", ".pyo")): */
         if (len >= 4 &&