diff options
| author | Michael W. Hudson <mwh@python.net> | 2002-01-28 15:13:21 (GMT) |
|---|---|---|
| committer | Michael W. Hudson <mwh@python.net> | 2002-01-28 15:13:21 (GMT) |
| commit | 23d65ff4e4821bb4afc5eee49634685edc5f1894 (patch) | |
| tree | 5471ebaffb028e89ccbe763396c3e6a65ee1ce16 /Python | |
| parent | abab74038d1f289d4b76cc44ddc4c66170e15522 (diff) | |
| download | cpython-23d65ff4e4821bb4afc5eee49634685edc5f1894.zip cpython-23d65ff4e4821bb4afc5eee49634685edc5f1894.tar.gz cpython-23d65ff4e4821bb4afc5eee49634685edc5f1894.tar.bz2 | |
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.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/dynload_hpux.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c index cbdb35a..6aef796 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); |