Catch exceptions from iterator.MoveNext()

(cherry picked from commit 8531755)
guo-m · Jun 25, 2018 · 6b03c63 · 6b03c63
1 parent d0f34e9
commit 6b03c63
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/runtime/iterator.cs b/src/runtime/iterator.cs
@@ -23,9 +23,21 @@ public Iterator(IEnumerator e)
         public static IntPtr tp_iternext(IntPtr ob)
         {
             var self = GetManagedObject(ob) as Iterator;
-            if (!self.iter.MoveNext())
+            try
             {
-                Exceptions.SetError(Exceptions.StopIteration, Runtime.PyNone);
+                if (!self.iter.MoveNext())
+                {
+                    Exceptions.SetError(Exceptions.StopIteration, Runtime.PyNone);
+                    return IntPtr.Zero;
+                }
+            }
+            catch (Exception e)
+            {
+                if (e.InnerException != null)
+                {
+                    e = e.InnerException;
+                }
+                Exceptions.SetError(e);
                 return IntPtr.Zero;
             }
             object item = self.iter.Current;