From 0a8403181210d26e12974e5dc8d02e349847045e Mon Sep 17 00:00:00 2001
From: Jake <yo-ki@yo-ki.com>
Date: Tue, 7 Nov 2023 22:27:54 +0900
Subject: [PATCH] To fix memory access exception when iteration breaks in the
 middle of the list before reaching end.

---
 .../CollectionWrappers/IterableWrapper.cs     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/runtime/CollectionWrappers/IterableWrapper.cs b/src/runtime/CollectionWrappers/IterableWrapper.cs
index d30e584d3..849e3997b 100644
--- a/src/runtime/CollectionWrappers/IterableWrapper.cs
+++ b/src/runtime/CollectionWrappers/IterableWrapper.cs
@@ -24,18 +24,22 @@ public IEnumerator<T> GetEnumerator()
             {
                 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();
             }
         }
     }