From: Thomas Heller <theller@ctypes.org>
Date: Mon, 28 Jan 2008 08:42:22 +0000 (+0000)
Subject: Revert rev. 59926, it breaks comtypes (I need to further examine this).
X-Git-Tag: v2.5.2c1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9b20734f4b5cbdb3190d18068da43ac0177c06e;p=python

Revert rev. 59926, it breaks comtypes (I need to further examine this).
---

diff --git a/Lib/ctypes/test/test_funcptr.py b/Lib/ctypes/test/test_funcptr.py
index 92bf89bb60..7ea873f0a4 100644
--- a/Lib/ctypes/test/test_funcptr.py
+++ b/Lib/ctypes/test/test_funcptr.py
@@ -123,11 +123,5 @@ class CFuncPtrTestCase(unittest.TestCase):
         self.failUnlessEqual(strtok(None, "\n"), "c")
         self.failUnlessEqual(strtok(None, "\n"), None)
 
-    def test_NULL_funcptr(self):
-        tp = CFUNCTYPE(c_int)
-        func = tp() # NULL function pointer
-        # raise a ValueError when we try to call it
-        self.assertRaises(ValueError, func)
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
index f892f4d1af..7cdb1c4a7f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -217,8 +217,6 @@ Extension Modules
 
 - Fix a potential 'SystemError: NULL result without error' in _ctypes.
 
-- Prevent a segfault when a ctypes NULL function pointer is called.
-
 - Bug #1301: Bad assert in _tkinter fixed.
 
 - Patch #1114: fix curses module compilation on 64-bit AIX, & possibly
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index fe772acc5c..814b85496b 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3305,11 +3305,6 @@ CFuncPtr_call(CFuncPtrObject *self, PyObject *inargs, PyObject *kwds)
 
 
 	pProc = *(void **)self->b_ptr;
-	if (pProc == NULL) {
-		PyErr_SetString(PyExc_ValueError,
-				"attempt to call NULL function pointer");
-		return NULL;
-	}
 #ifdef MS_WIN32
 	if (self->index) {
 		/* It's a COM method */