Dispose the owned 'current' object owned by PyIter instances when no longer needed.

tonyroberts · tonyroberts · commit 42a7dcabb939 · 2015-06-05T15:33:46.000+01:00
diff --git a/src/runtime/pyiter.cs b/src/runtime/pyiter.cs
@@ -21,42 +21,57 @@ public class PyIter : PyObject, IEnumerator<object>
         private PyObject _current = null;
 
         /// <summary>
-            /// PyIter Constructor
-            /// </summary>
-            ///
-            /// <remarks>
-            /// Creates a new PyIter from an existing iterator reference. Note 
-            /// that the instance assumes ownership of the object reference. 
-            /// The object reference is not checked for type-correctness. 
-            /// </remarks>
+        /// PyIter Constructor
+        /// </summary>
+        ///
+        /// <remarks>
+        /// Creates a new PyIter from an existing iterator reference. Note
+        /// that the instance assumes ownership of the object reference.
+        /// The object reference is not checked for type-correctness.
+        /// </remarks>
 
-            public PyIter(IntPtr ptr) : base(ptr) {}
+        public PyIter(IntPtr ptr) : base(ptr) {}
 
         /// <summary>
-            /// PyIter Constructor
-            /// </summary>
-            ///
-            /// <remarks>
-            /// Creates a Python iterator from an iterable. Like doing "iter(iterable)" in python.
-            /// </remarks>
+        /// PyIter Constructor
+        /// </summary>
+        ///
+        /// <remarks>
+        /// Creates a Python iterator from an iterable. Like doing "iter(iterable)" in python.
+        /// </remarks>
 
-            public PyIter(PyObject iterable) : base() 
+        public PyIter(PyObject iterable) : base()
         {
             obj = Runtime.PyObject_GetIter(iterable.obj);
                 if (obj == IntPtr.Zero)
                         throw new PythonException();
         }
 
+        protected override void Dispose(bool disposing)
+        {
+            if (null != _current)
+            {
+                _current.Dispose();
+                _current = null;
+            }
+            base.Dispose(disposing);
+        }
+
         #region IEnumerator Members
 
         public bool MoveNext()
         {
+            // dispose of the previous object, if there was one
+            if (null != _current)
+            {
+                _current.Dispose();
+                _current = null;
+            }
+
             IntPtr next = Runtime.PyIter_Next(obj);
             if (next == IntPtr.Zero)
-            {
-                _current = null; //release reference
                 return false;
-            }
+
             _current = new PyObject(next);
             return true;
         }
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -118,19 +118,23 @@ public object AsManagedObject(Type t) {
     /// collection occurs.
     /// </remarks>
 
-    public void Dispose() {
+    protected virtual void Dispose(bool disposing) {
         if (!disposed) {
             if (Runtime.Py_IsInitialized() > 0) {
                 IntPtr gs = PythonEngine.AcquireLock();
                 Runtime.Decref(obj);
-                obj = IntPtr.Zero;    
+                obj = IntPtr.Zero;
                 PythonEngine.ReleaseLock(gs);
             }
-            GC.SuppressFinalize(this);
             disposed = true;
         }
     }
 
+    public void Dispose() {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
 
     /// <summary>
     /// GetPythonType Method
