diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-08 10:05:50 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-08 10:05:50 (GMT) |
| commit | 305e1a749ff1b39e6c2009fb25111cca24f7a874 (patch) | |
| tree | 5e38be4838d963d8131237ee38c4f314a2216d04 /Modules | |
| parent | ed636a84b90f7ac5e9e396e3a026188ed53f9307 (diff) | |
| download | cpython-305e1a749ff1b39e6c2009fb25111cca24f7a874.zip cpython-305e1a749ff1b39e6c2009fb25111cca24f7a874.tar.gz cpython-305e1a749ff1b39e6c2009fb25111cca24f7a874.tar.bz2 | |
Issue #16628: Fix a memory leak in ctypes.resize().
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/_ctypes.c | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/callproc.c | 2 | ||||
| -rw-r--r-- | Modules/_ctypes/ctypes.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 8be5958..603b3b8 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -2442,7 +2442,7 @@ PyCData_clear(CDataObject *self) assert(dict); /* Cannot be NULL for CDataObject instances */ Py_CLEAR(self->b_objects); if ((self->b_needsfree) - && ((size_t)dict->size > sizeof(self->b_value))) + && _CDataObject_HasExternalBuffer(self)) PyMem_Free(self->b_ptr); self->b_ptr = NULL; Py_CLEAR(self->b_base); diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 1f3c1c0..3465995 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -1666,7 +1666,7 @@ resize(PyObject *self, PyObject *args) obj->b_size = size; goto done; } - if (obj->b_size <= sizeof(obj->b_value)) { + if (!_CDataObject_HasExternalBuffer(obj)) { /* We are currently using the objects default buffer, but it isn't large enough any more. */ void *ptr = PyMem_Malloc(size); diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h index 27abe65..5237ac2 100644 --- a/Modules/_ctypes/ctypes.h +++ b/Modules/_ctypes/ctypes.h @@ -116,6 +116,7 @@ extern int PyObject_stginfo(PyObject *self, Py_ssize_t *psize, Py_ssize_t *palig extern PyTypeObject PyCData_Type; #define CDataObject_CheckExact(v) ((v)->ob_type == &PyCData_Type) #define CDataObject_Check(v) PyObject_TypeCheck(v, &PyCData_Type) +#define _CDataObject_HasExternalBuffer(v) ((v)->b_ptr != (char *)&(v)->b_value) extern PyTypeObject PyCSimpleType_Type; #define PyCSimpleTypeObject_CheckExact(v) ((v)->ob_type == &PyCSimpleType_Type) |