changeset: 68731:c1a5a7dca1ec user: Victor Stinner date: Mon Mar 14 13:40:04 2011 -0400 files: Python/import.c description: Issue #3080: find_module() sets an empty path for builtin and frozen modules diff -r fe1d421ca3fa -r c1a5a7dca1ec Python/import.c --- a/Python/import.c Mon Mar 14 13:22:54 2011 -0400 +++ b/Python/import.c Mon Mar 14 13:40:04 2011 -0400 @@ -1943,10 +1943,8 @@ 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 @@ 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) {