From: Davide Rizzo <sorcio@gmail.com>
Date: Wed, 6 Mar 2019 17:08:31 +0000 (+0100)
Subject: bpo-36139: Fix mmap_object_dealloc(): hold the GIL to call PyMem_Free() (GH-12199)
X-Git-Tag: v3.8.0a3~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc078947a5033a048d804e244e847b5844734439;p=thirdparty%2FPython%2Fcpython.git

bpo-36139: Fix mmap_object_dealloc(): hold the GIL to call PyMem_Free() (GH-12199)
---

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 326288cccde5..6ddbf70d9a97 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -117,26 +117,28 @@ typedef struct {
 static void
 mmap_object_dealloc(mmap_object *m_obj)
 {
-    Py_BEGIN_ALLOW_THREADS
 #ifdef MS_WINDOWS
+    Py_BEGIN_ALLOW_THREADS
     if (m_obj->data != NULL)
         UnmapViewOfFile (m_obj->data);
     if (m_obj->map_handle != NULL)
         CloseHandle (m_obj->map_handle);
     if (m_obj->file_handle != INVALID_HANDLE_VALUE)
         CloseHandle (m_obj->file_handle);
+    Py_END_ALLOW_THREADS
     if (m_obj->tagname)
         PyMem_Free(m_obj->tagname);
 #endif /* MS_WINDOWS */
 
 #ifdef UNIX
+    Py_BEGIN_ALLOW_THREADS
     if (m_obj->fd >= 0)
         (void) close(m_obj->fd);
     if (m_obj->data!=NULL) {
         munmap(m_obj->data, m_obj->size);
     }
-#endif /* UNIX */
     Py_END_ALLOW_THREADS
+#endif /* UNIX */
 
     if (m_obj->weakreflist != NULL)
         PyObject_ClearWeakRefs((PyObject *) m_obj);