[Python-checkins] r78436 - in python/branches/release31-maint: Misc/NEWS Modules/_ctypes/callproc.c

[larry.hastings]

Author: larry.hastings
Date: Wed Feb 24 23:58:18 2010
New Revision: 78436

Log:
Merged revisions 78435 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78435 | larry.hastings | 2010-02-24 17:49:58 -0500 (Wed, 24 Feb 2010) | 4 lines
  
  Issue #5939: Add additional runtime checking to ensure a valid capsule
  in Modules/_ctypes/callproc.c.  Reviewed by Benjamin P.  My first commit!
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/_ctypes/callproc.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Wed Feb 24 23:58:18 2010
@@ -12,7 +12,9 @@
 Core and Builtins
 -----------------
 
-=======
+- Issue #5939: Add additional runtime checking to ensure a valid capsule
+  in Modules/_ctypes/callproc.c.
+
 - Issue #7309: Fix unchecked attribute access when converting
   UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to
   strings.

Modified: python/branches/release31-maint/Modules/_ctypes/callproc.c
==============================================================================
--- python/branches/release31-maint/Modules/_ctypes/callproc.c	(original)
+++ python/branches/release31-maint/Modules/_ctypes/callproc.c	Wed Feb 24 23:58:18 2010
@@ -139,8 +139,14 @@
 			return NULL;
 	}
 	errobj = PyDict_GetItem(dict, error_object_name);
-	if (errobj)
+	if (errobj) {
+		if (!PyCapsule_IsValid(errobj, CTYPES_CAPSULE_NAME_PYMEM)) {
+			PyErr_SetString(PyExc_RuntimeError,
+				"ctypes.error_object is an invalid capsule");
+			return NULL;
+		}
 		Py_INCREF(errobj);
+	}
 	else {
 		void *space = PyMem_Malloc(sizeof(int) * 2);
 		if (space == NULL)