summaryrefslogtreecommitdiff
path: root/Python/dynload_shlib.c
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2005-11-09 06:59:35 +0000
committerNeal Norwitz <nnorwitz@gmail.com>2005-11-09 06:59:35 +0000
commit3f83c9e0d8a832c1d00cfdc1dd1c1b243e4c50c7 (patch)
tree460c82dfd21b4dfc95e57725732cffc2b00a22ea /Python/dynload_shlib.c
parent1bdd69d5b114db6fa6980e6aa36c7f081965ccb2 (diff)
downloadcpython-3f83c9e0d8a832c1d00cfdc1dd1c1b243e4c50c7.tar.gz
- SF Bug #1350188, "setdlopenflags" leads to crash upon "import"
It was possible dlerror() returns a NULL pointer, use a default error message in this case.
Diffstat (limited to 'Python/dynload_shlib.c')
-rw-r--r--Python/dynload_shlib.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/Python/dynload_shlib.c b/Python/dynload_shlib.c
index 2b5a11a220..960e5c0933 100644
--- a/Python/dynload_shlib.c
+++ b/Python/dynload_shlib.c
@@ -130,7 +130,10 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname,
handle = dlopen(pathname, dlopenflags);
if (handle == NULL) {
- PyErr_SetString(PyExc_ImportError, dlerror());
+ char *error = dlerror();
+ if (error == NULL)
+ error = "unknown dlopen() error";
+ PyErr_SetString(PyExc_ImportError, error);
return NULL;
}
if (fp != NULL && nhandles < 128)