[3.11] pythonGH-101696: invalidate type version tag in `_PyStaticType…

…_Dealloc` (pythonGH-101697). (cherry picked from commit d9de079) Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
erlend-aasland · Feb 9, 2023 · 5f83520 · 5f83520
1 parent 4a9dff0
commit 5f83520
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-02-08-17-13-31.gh-issue-101696.seJhTt.rst b/Misc/NEWS.d/next/Core and Builtins/2023-02-08-17-13-31.gh-issue-101696.seJhTt.rst
@@ -0,0 +1 @@
+Invalidate type version tag in ``_PyStaticType_Dealloc`` for static types, avoiding bug where a false cache hit could crash the interpreter. Patch by Kumar Aditya.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -4080,6 +4080,8 @@ _PyStaticType_Dealloc(PyTypeObject *type)
     }
 
     type->tp_flags &= ~Py_TPFLAGS_READY;
+    type->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+    type->tp_version_tag = 0;
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Invalidate type version tag in ``_PyStaticType_Dealloc`` for static types, avoiding bug where a false cache hit could crash the interpreter. Patch by Kumar Aditya.
-Original file line number
+Diff line change
@@ Expand Up / @@ -4080,6 +4080,8 @@ _PyStaticType_Dealloc(PyTypeObject *type) @@
         }
         type->tp_flags &= ~Py_TPFLAGS_READY;
+        type->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG;
+        type->tp_version_tag = 0;
     }
@@ Expand Down @@