Fix crash when object is not iterable

swoole · Sep 6, 2024 · c4c887c · c4c887c
1 parent ad3ea79
commit c4c887c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/php/object.cc b/src/php/object.cc
@@ -62,17 +62,21 @@ PyObject *phpy_object_get_iterator(zval *object) {
 
 void phpy_object_iterator_reset(zval *object) {
     auto oo = phpy_object_get_object(object);
-    // Return value: New reference
     if (oo->iterator != NULL) {
         Py_DECREF(oo->iterator);
     }
-    oo->iterator = PyObject_GetIter(oo->object);
-    // Return value: New reference
     if (oo->current != NULL) {
         Py_DECREF(oo->current);
     }
-    oo->current = PyIter_Next(oo->iterator);
     oo->index = 0;
+    // Return value: New reference
+    oo->iterator = PyObject_GetIter(oo->object);
+    if (oo->iterator == NULL) {
+        phpy::php::throw_error_if_occurred();
+    } else {
+        // Return value: New reference
+        oo->current = PyIter_Next(oo->iterator);
+    }
 }
 
 PyObject *phpy_object_iterator_next(zval *object) {

diff --git a/tests/phpunit/IterTest.php b/tests/phpunit/IterTest.php
@@ -41,4 +41,14 @@ function testNextInt()
         }
         $this->assertEquals($array, range(1, 12));
     }
+
+    function testNotIterable()
+    {
+        $slice = PyCore::slice(1, 10);
+        try {
+            $iter = PyCore::iter($slice);
+        } catch (PyError $error) {
+            $this->assertStringContainsString("'slice' object is not iterable", $error->getMessage());
+        }
+    }
 }