]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #3080: find_module() sets an empty path for builtin and frozen modules
authorVictor Stinner <victor.stinner@haypocalc.com>
Mon, 14 Mar 2011 17:40:04 +0000 (13:40 -0400)
committerVictor Stinner <victor.stinner@haypocalc.com>
Mon, 14 Mar 2011 17:40:04 +0000 (13:40 -0400)
Python/import.c

index 73d38fe10fa87067bcc141ab08974680100cedbb..2c21112c4bc7e7c5397fb686ea7657d6d7084a5b 100644 (file)
@@ -1943,10 +1943,8 @@ find_module(PyObject *fullname, PyObject *name, PyObject *search_path_list,
         Py_DECREF(meta_path);
     }
 
-    if (find_frozen(fullname) != NULL) {
-        strcpy(buf, _PyUnicode_AsString(fullname));
+    if (find_frozen(fullname) != NULL)
         return &fd_frozen;
-    }
 
     if (search_path_list == NULL) {
 #ifdef MS_COREDLL
@@ -1954,10 +1952,8 @@ find_module(PyObject *fullname, PyObject *name, PyObject *search_path_list,
         struct filedescr *fdp;
         PyObject *filename, *filename_bytes;
 #endif
-        if (is_builtin(name)) {
-            strcpy(buf, _PyUnicode_AsString(name));
+        if (is_builtin(name))
             return &fd_builtin;
-        }
 #ifdef MS_COREDLL
         fp = _PyWin_FindRegisteredModule(name, &fdp, &filename);
         if (fp != NULL) {