To fix memory access exception when iteration breaks in the middle of the list before reaching end.

JakeJP · lostmsu · commit eef67db7ff80 · 2023-11-07T13:34:22.000-08:00
diff --git 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();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,22 @@ public IEnumerator<T> GetEnumerator()`
`24`	`24`	`{`
`25`	`25`	`iterObject = PyIter.GetIter(pyObject);`
`26`	`26`	`}`
`27`		`-`
`28`		`- using var _ = iterObject;`
`29`		`- while (true)`
	`27`	`+ try`
`30`	`28`	`{`
`31`		`- using var GIL = Py.GIL();`
`32`		`-`
`33`		`- if (!iterObject.MoveNext())`
	`29`	`+ while (true)`
`34`	`30`	`{`
`35`		`- iterObject.Dispose();`
`36`		`- break;`
	`31`	`+ using var _ = Py.GIL();`
	`32`	`+ if (!iterObject.MoveNext())`
	`33`	`+ {`
	`34`	`+ break;`
	`35`	`+ }`
	`36`	`+ yield return iterObject.Current.As<T>()!;`
`37`	`37`	`}`
`38`		`- yield return iterObject.Current.As<T>()!;`
	`38`	`+ }`
	`39`	`+ finally`
	`40`	`+ {`
	`41`	`+ using var _ = Py.GIL();`
	`42`	`+ iterObject.Dispose();`
`39`	`43`	`}`
`40`	`44`	`}`
`41`	`45`	`}`