mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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!
........
This commit is contained in:
Larry Hastings 2010-02-24 22:58:18 +00:00
parent 73ad434945
commit e5fd21f11f
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -12,7 +12,9 @@ What's New in Python 3.1.2?
Core and Builtins 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 - Issue #7309: Fix unchecked attribute access when converting
UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to
strings. strings.

8
Modules/_ctypes/callproc.c
View File

@ -139,8 +139,14 @@ _ctypes_get_errobj(int **pspace)
return NULL; return NULL;
} }
errobj = PyDict_GetItem(dict, error_object_name); 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); Py_INCREF(errobj);
}
else { else {
void *space = PyMem_Malloc(sizeof(int) * 2); void *space = PyMem_Malloc(sizeof(int) * 2);
if (space == NULL) if (space == NULL)