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.

diff --git a/Misc/ACKS b/Misc/ACKS
index 7362aa66ac97221820b20d84ea9617b37e30b9f9..047fd31356b7d37b1b0b9e20ae3711be0b2b39e1 100644 (file)
--- 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 cbdb35a240ad1dc1ad311692c1aa2442128596b3..6aef796f1149ffe5c693ae8e842ea3a497494907 100644 (file)
--- 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);