python2, python3: Extended existing patch to fix another crash
This commit is contained in:
@@ -1,12 +1,6 @@
|
||||
diff -r c087ac6fc171 Modules/_ctypes/_ctypes.c
|
||||
--- a/Modules/_ctypes/_ctypes.c Wed Jan 28 10:52:49 2015 +0200
|
||||
+++ b/Modules/_ctypes/_ctypes.c Wed Jan 28 19:53:12 2015 +0900
|
||||
@@ -637,17 +637,17 @@ CDataType_in_dll(PyObject *type, PyObjec
|
||||
return NULL;
|
||||
}
|
||||
#else
|
||||
address = (void *)ctypes_dlsym(handle, name);
|
||||
if (!address) {
|
||||
--- a/Modules/_ctypes/_ctypes.c 2014-12-10 16:59:51.000000000 +0100
|
||||
+++ b/Modules/_ctypes/_ctypes.c 2015-03-13 03:17:29.360113700 +0100
|
||||
@@ -642,7 +642,7 @@
|
||||
#ifdef __CYGWIN__
|
||||
/* dlerror() isn't very helpful on cygwin */
|
||||
PyErr_Format(PyExc_ValueError,
|
||||
@@ -15,8 +9,12 @@ diff -r c087ac6fc171 Modules/_ctypes/_ctypes.c
|
||||
name);
|
||||
#else
|
||||
PyErr_SetString(PyExc_ValueError, ctypes_dlerror());
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
return PyCData_AtAddress(type, address);
|
||||
@@ -3393,7 +3393,7 @@
|
||||
#ifdef __CYGWIN__
|
||||
/* dlerror() isn't very helpful on cygwin */
|
||||
PyErr_Format(PyExc_AttributeError,
|
||||
- "function '%s' not found (%s) ",
|
||||
+ "function '%s' not found",
|
||||
name);
|
||||
#else
|
||||
PyErr_SetString(PyExc_AttributeError, ctypes_dlerror());
|
||||
|
||||
Reference in New Issue
Block a user