Issue #3080: find_module() sets an empty path for builtin and frozen modules

This commit is contained in:
Victor Stinner 2011-03-14 13:40:04 -04:00
parent 533d78399f
commit df75a023a0
1 changed files with 2 additions and 6 deletions

View 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) {