ensure interned strings can not be referenced after InternString.Shutdown

lostmsu · lostmsu · commit d0d7616fdf18 · 2021-02-20T19:35:43.000-08:00
diff --git a/src/runtime/intern.cs b/src/runtime/intern.cs
@@ -42,9 +42,10 @@ public static void Initialize()
 
         public static void Shutdown()
         {
-            foreach (var ptr in _intern2strings.Keys)
+            foreach (var entry in _intern2strings)
             {
-                Runtime.XDecref(ptr);
+                Runtime.XDecref(entry.Key);
+                typeof(PyIdentifier).GetField(entry.Value).SetValue(null, IntPtr.Zero);
             }
             _string2interns = null;
             _intern2strings = null;

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,10 @@ public static void Initialize()`
`42`	`42`
`43`	`43`	`public static void Shutdown()`
`44`	`44`	`{`
`45`		`- foreach (var ptr in _intern2strings.Keys)`
	`45`	`+ foreach (var entry in _intern2strings)`
`46`	`46`	`{`
`47`		`- Runtime.XDecref(ptr);`
	`47`	`+ Runtime.XDecref(entry.Key);`
	`48`	`+ typeof(PyIdentifier).GetField(entry.Value).SetValue(null, IntPtr.Zero);`
`48`	`49`	`}`
`49`	`50`	`_string2interns = null;`
`50`	`51`	`_intern2strings = null;`