fix memory access error when iteration breaks

JakeJP · JakeJP · commit a6f27ab98e9b · 2023-11-07T22:27:54.000+09:00
in the middle of the list before reaching end.
diff --git a/src/runtime/CollectionWrappers/IterableWrapper.cs b/src/runtime/CollectionWrappers/IterableWrapper.cs
@@ -1,42 +1,46 @@
-using System;
-using System.Collections.Generic;
-using System.Collections;
-
-namespace Python.Runtime.CollectionWrappers
-{
-    internal class IterableWrapper<T> : IEnumerable<T>
-    {
-        protected readonly PyObject pyObject;
-
-        public IterableWrapper(PyObject pyObj)
-        {
-            if (pyObj == null)
-                throw new ArgumentNullException();
-            pyObject = new PyObject(pyObj.Reference);
-        }
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        public IEnumerator<T> GetEnumerator()
-        {
-            PyIter iterObject;
-            using (Py.GIL())
-            {
-                iterObject = PyIter.GetIter(pyObject);
+using System;
+using System.Collections.Generic;
+using System.Collections;
+
+namespace Python.Runtime.CollectionWrappers
+{
+    internal class IterableWrapper<T> : IEnumerable<T>
+    {
+        protected readonly PyObject pyObject;
+
+        public IterableWrapper(PyObject pyObj)
+        {
+            if (pyObj == null)
+                throw new ArgumentNullException();
+            pyObject = new PyObject(pyObj.Reference);
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            PyIter iterObject;
+            using (Py.GIL())
+            {
+                iterObject = PyIter.GetIter(pyObject);
             }
-
-            using var _ = iterObject;
-            while (true)
+            try
             {
-                using var GIL = Py.GIL();
-
-                if (!iterObject.MoveNext())
+                while (true)
                 {
-                    iterObject.Dispose();
-                    break;
+                    using var _ = Py.GIL();
+                    if (!iterObject.MoveNext())
+                    {
+                        break;
+                    }
+                    yield return iterObject.Current.As<T>()!;
                 }
-                yield return iterObject.Current.As<T>()!;
             }
-        }
-    }
-}
+            finally
+            {
+                using var _ = Py.GIL();
+                iterObject.Dispose();
+            }
+        }
+    }
+}
