From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 1 May 2020 23:06:23 +0000 (-0700)
Subject: bpo-40412: Nullify inittab_copy during finalization (GH-19746)
X-Git-Tag: v3.8.3~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1205afb3e10194fe22fa76385abb7e522144eb29;p=thirdparty%2FPython%2Fcpython.git

bpo-40412: Nullify inittab_copy during finalization (GH-19746)


Otherwise we leave a dangling pointer to free'd memory. If we
then initialize a new interpreter in the same process and call
PyImport_ExtendInittab, we will (likely) crash when calling
PyMem_RawRealloc(inittab_copy, ...) since the pointer address
is bogus.

Automerge-Triggered-By: @brettcannon
(cherry picked from commit 64224a4727321a8dd33e6f769edda401193ebef0)

Co-authored-by: Gregory Szorc <gregory.szorc@gmail.com>
---

diff --git a/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst b/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst
new file mode 100644
index 000000000000..92bfcddf115a
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst	
@@ -0,0 +1 @@
+Nullify inittab_copy during finalization, preventing future interpreter initializations in an embedded situation from crashing. Patch by Gregory Szorc.
diff --git a/Python/import.c b/Python/import.c
index 495012d1c7da..b4074d1dfc3f 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -300,6 +300,7 @@ _PyImport_Fini2(void)
 
     /* Free memory allocated by PyImport_ExtendInittab() */
     PyMem_RawFree(inittab_copy);
+    inittab_copy = NULL;
 
     PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
 }