summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-03-16 22:25:02 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-03-16 22:25:02 (GMT)
commit6150f31963cbc24c529b07f6763854fbb7e62f60 (patch)
tree99e15d5104bde4808f0b86903d318deeeae48e48
parentce911c3fed7e6404fba7de3868b1000425984b1e (diff)
downloadcpython-6150f31963cbc24c529b07f6763854fbb7e62f60.zip
cpython-6150f31963cbc24c529b07f6763854fbb7e62f60.tar.gz
cpython-6150f31963cbc24c529b07f6763854fbb7e62f60.tar.bz2
Fix usage of PyMem_Malloc() in overlapped.c
Issue #26563: Replace PyMem_Malloc() with PyMem_RawFree() since PostToQueueCallback() calls PyMem_RawFree() (previously PyMem_Free()) in a new C thread which doesn't hold the GIL.
-rw-r--r--Modules/overlapped.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index ef77c88..8e6d397 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -238,7 +238,7 @@ PostToQueueCallback(PVOID lpParameter, BOOL TimerOrWaitFired)
PostQueuedCompletionStatus(p->CompletionPort, TimerOrWaitFired,
0, p->Overlapped);
/* ignore possible error! */
- PyMem_Free(p);
+ PyMem_RawFree(p);
}
PyDoc_STRVAR(
@@ -262,7 +262,10 @@ overlapped_RegisterWaitWithQueue(PyObject *self, PyObject *args)
&Milliseconds))
return NULL;
- pdata = PyMem_Malloc(sizeof(struct PostCallbackData));
+ /* Use PyMem_RawMalloc() rather than PyMem_Malloc(), since
+ PostToQueueCallback() will call PyMem_Free() from a new C thread
+ which doesn't hold the GIL. */
+ pdata = PyMem_RawMalloc(sizeof(struct PostCallbackData));
if (pdata == NULL)
return SetFromWindowsErr(0);
@@ -273,7 +276,7 @@ overlapped_RegisterWaitWithQueue(PyObject *self, PyObject *args)
pdata, Milliseconds,
WT_EXECUTEINWAITTHREAD | WT_EXECUTEONLYONCE))
{
- PyMem_Free(pdata);
+ PyMem_RawFree(pdata);
return SetFromWindowsErr(0);
}