Avoid a potential double-free bug.

e502693e · Thomas Heller · ba29e4c5 · e502693e · e502693e
Commit e502693e authored Mar 20, 2006 by Thomas Heller
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Modules/_ctypes/_ctypes.c Modules/_ctypes/_ctypes.c +3 -1

Modules/_ctypes/callbacks.c Modules/_ctypes/callbacks.c +0 -1

No files found.
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -3191,8 +3191,10 @@ CFuncPtr_clear(CFuncPtrObject *self)
 	Py_CLEAR(self->converters);
 	Py_CLEAR(self->paramflags);

-	if (self->thunk)
+	if (self->thunk) {
 		FreeCallback(self->thunk);
+		PyMem_Free(self->thunk);
+	}
 	self->thunk = NULL;

 	return CData_clear((CDataObject *)self);

--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -292,7 +292,6 @@ static void closure_fcn(ffi_cif *cif,
 void FreeCallback(THUNK thunk)
 {
 	FreeClosure(((ffi_info *)thunk)->pcl);
-	PyMem_Free(thunk);
 }

 THUNK AllocFunctionCallback(PyObject *callable,