From 23d65ff4e4821bb4afc5eee49634685edc5f1894 Mon Sep 17 00:00:00 2001 From: "Michael W. Hudson" Date: Mon, 28 Jan 2002 15:13:21 +0000 Subject: [PATCH] It's merge time! Backport loewis' checkin of revision 2.7 (of dynload_hpux.c): Test for error status of shl_findsym. Fixes #505417. 2.2.1 candiate. --- Misc/ACKS | 1 + Python/dynload_hpux.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Misc/ACKS b/Misc/ACKS index 7362aa66ac97..047fd31356b7 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -158,6 +158,7 @@ Jonathan Giddy Chris Gonnerman David Goodger Hans de Graaff +Eddy De Greef Duncan Grisby Dag Gruneau Michael Guravage diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c index cbdb35a240ad..6aef796f1149 100644 --- a/Python/dynload_hpux.c +++ b/Python/dynload_hpux.c @@ -47,7 +47,10 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname); if (Py_VerboseFlag) printf("shl_findsym %s\n", funcname); - shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p); + if (shl_findsym(&lib, funcname, TYPE_UNDEFINED, (void *) &p) == -1) { + shl_unload(lib); + p = NULL; + } if (p == NULL && Py_VerboseFlag) perror(funcname); -- 2.47.3