Add cleanup to ClassInfo

BadSingleton · BadSingleton · commit d2408b9f7548 · 2020-08-26T15:50:31.000-04:00
Addresses comment: #958
diff --git a/src/runtime/classmanager.cs b/src/runtime/classmanager.cs
@@ -212,8 +212,6 @@ private static void InitClassBase(Type type, ClassBase impl)
                 var item = (ManagedType)iter.Value;
                 var name = (string)iter.Key;
                 Runtime.PyDict_SetItemString(dict, name, item.pyHandle);
-                // info.members are already useless
-                item.DecrRefCount();
             }
 
             // If class has constructors, generate an __doc__ attribute.
@@ -463,7 +461,7 @@ private static ClassInfo GetClassInfo(Type type)
     }
 
 
-    internal class ClassInfo
+    internal class ClassInfo : IDisposable
     {
         public Indexer indexer;
         public Hashtable members;
@@ -473,5 +471,28 @@ internal ClassInfo()
             members = new Hashtable();
             indexer = null;
         }
+
+        ~ClassInfo()
+        {
+            Dispose();
+        }
+
+        private bool disposed = false;
+
+        public void Dispose()
+        {
+            if (!disposed)
+            {
+                disposed = true;
+                foreach(var member in members)
+                {
+                    var item = (ManagedType)member;
+                    if (item != null)
+                    {
+                        item.DecrRefCount();
+                    }
+                }
+            }
+        }
     }
 }
