Add NEWS entry; add debug check

python · vstinner · Dec 20, 2017 · Dec 20, 2017 · Dec 20, 2017 · Dec 20, 2017
commit 3330941d13f5af7ecb4e5ff20114d8bb90539405
diff --git a/Misc/NEWS.d/next/C API/2017-12-20-23-22-32.bpo-32030.d1dcwh.rst b/Misc/NEWS.d/next/C API/2017-12-20-23-22-32.bpo-32030.d1dcwh.rst
@@ -0,0 +1,2 @@
+Py_Initialize() doesn't reset the memory allocators to default if the
+``PYTHONMALLOC`` environment variable is not set.
diff --git a/Modules/main.c b/Modules/main.c
@@ -2577,6 +2577,10 @@ pymain_cmdline(_PyMain *pymain)
        must use the same allocator than this function. */
     PyMemAllocatorEx old_alloc;
     _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
+#ifdef Py_DEBUG
+    PyMemAllocatorEx default_alloc;
+    PyMem_GetAllocator(PYMEM_DOMAIN_RAW, &default_alloc);
+#endif
 
     _Py_CommandLineDetails cmdline;
     memset(&cmdline, 0, sizeof(cmdline));
@@ -2589,6 +2593,12 @@ pymain_cmdline(_PyMain *pymain)
 
     pymain_clear_cmdline(pymain, &cmdline);
 
+#ifdef Py_DEBUG
+    /* Make sure that PYMEM_DOMAIN_RAW has not been modified */
+    PyMemAllocatorEx cur_alloc;
+    PyMem_GetAllocator(PYMEM_DOMAIN_RAW, &cur_alloc);
+    assert(memcmp(&cur_alloc, &default_alloc, sizeof(cur_alloc)) == 0);
+#endif
     PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
     return res;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Py_Initialize() doesn't reset the memory allocators to default if the
		``PYTHONMALLOC`` environment variable is not set.