summaryrefslogtreecommitdiff
path: root/Python/dynload_dl.c
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-11-07 09:07:22 +0100
committerHynek Schlawack <hs@ox.cx>2012-11-07 09:07:22 +0100
commit03464ecbcf5a88f7cf8d895700f03e4088799cc4 (patch)
treeed54ebc1e16f9f606bb03fb02d0fb446cfcb17ac /Python/dynload_dl.c
parenta35283195c8a126cf7f4bed558f8ee758023737d (diff)
parent49d34d665e6af4a37d2194bf677e9c7df27a7ebf (diff)
downloadcpython-03464ecbcf5a88f7cf8d895700f03e4088799cc4.tar.gz
Issue #15001: fix segfault on "del sys.module['__main__']"
Patch by Victor Stinner.
Diffstat (limited to 'Python/dynload_dl.c')
-rw-r--r--Python/dynload_dl.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
index 2606e1e32f..5836cb3b29 100644
--- a/Python/dynload_dl.c
+++ b/Python/dynload_dl.c
@@ -9,18 +9,14 @@
extern char *Py_GetProgramName(void);
-const struct filedescr _PyImport_DynLoadFiletab[] = {
- {".o", "rb", C_EXTENSION},
- {"module.o", "rb", C_EXTENSION},
- {0, 0}
-};
+const char *_PyImport_DynLoadFiletab[] = {".o", NULL};
-dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
- const char *pathname, FILE *fp)
+dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
+ const char *pathname, FILE *fp)
{
- char funcname[258];
+ char funcname[258];
- PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
- return dl_loadmod(Py_GetProgramName(), pathname, funcname);
+ PyOS_snprintf(funcname, sizeof(funcname), "PyInit_%.200s", shortname);
+ return dl_loadmod(Py_GetProgramName(), pathname, funcname);
}