Merged revisions 64976-64977 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64976 | thomas.heller | 2008-07-15 21:39:38 +0200 (Tue, 15 Jul 2008) | 3 lines

  Issue #3313: Contrary to the man page, a failed dlopen() call does not
  always set a dlerror() message.
........
  r64977 | thomas.heller | 2008-07-15 21:44:25 +0200 (Tue, 15 Jul 2008) | 2 lines

  Add Victor Stinner, he provided the patch for issue #3313.
........

diff --git a/Misc/ACKS b/Misc/ACKS
index ce010d51f2cb7492d226325b42b9c942249016c8..dbb2035fac0177440245b150f6dec2dfe64d0c1d 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -771,3 +771,4 @@ Uwe Zessin
 Amaury Forgeot d'Arc
 Peter Åstrand
 Tarek Ziad\8e
+Victor Stinner

diff --git a/Misc/NEWS b/Misc/NEWS
index 010c06f4e62e4b042f7b997ff8feee02996dca2e..3272f00b555be4ec3c7b5c2421da119f4fff3c01 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #3313: Fixed a crash when a failed dlopen() call does not set
+  a valid dlerror() message.
+
 - Issue #3258: Fixed a crash when a ctypes POINTER type to an
   incomplete structure was created.
 

diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 0a305ed89dee836b9eb75277859927fb89d3051d..d45278580fa897ca0bf58a2059fc255a749393f9 100644 (file)
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1383,8 +1383,11 @@ static PyObject *py_dl_open(PyObject *self, PyObject *args)
        mode |= RTLD_NOW;
        handle = ctypes_dlopen(name, mode);
        if (!handle) {
+               char *errmsg = ctypes_dlerror();
+               if (!errmsg)
+                       errmsg = "dlopen() error";
                PyErr_SetString(PyExc_OSError,
-                                      ctypes_dlerror());
+                                      errmsg);
                return NULL;
        }
        return PyLong_FromVoidPtr(handle);