From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 23 Oct 2011 15:35:46 +0000 (+0200)
Subject: Add ready checks for make_compiled_pathname.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30260a7fe31c4051bd66e901c6d87296e29c0dfc;p=python

Add ready checks for make_compiled_pathname.
---

diff --git a/Python/import.c b/Python/import.c
index 1101c920f5..5dcaf3a40e 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -929,7 +929,10 @@ rightmost_sep_obj(PyObject* o)
    for the compiled file, or NULL if there's no space in the buffer.
    Doesn't set an exception.
 
-   foo.py -> __pycache__/foo.<tag>.pyc */
+   foo.py -> __pycache__/foo.<tag>.pyc
+
+   pathstr is assumed to be "ready".
+*/
 
 static PyObject*
 make_compiled_pathname(PyObject *pathstr, int debug)
@@ -1458,6 +1461,8 @@ load_source_module(PyObject *name, PyObject *pathname, FILE *fp)
         goto error;
     }
 #endif
+    if (PyUnicode_READY(pathname) < 0)
+        return NULL;
     cpathname = make_compiled_pathname(pathname, !Py_OptimizeFlag);
 
     if (cpathname != NULL)
@@ -3949,6 +3954,9 @@ imp_cache_from_source(PyObject *self, PyObject *args, PyObject *kws)
         return NULL;
     }
 
+    if (PyUnicode_READY(pathname) < 0)
+        return NULL;
+
     cpathname = make_compiled_pathname(pathname, debug);
     Py_DECREF(pathname);