Prevents double call to internal iterator rewind handler

ju1ius · Girgias · commit da7a66d64749 · 2023-09-05T10:26:19.000+01:00
Closes phpGH-12060 Signed-off-by: George Peter Banyard <girgias@php.net>
diff --git a/NEWS b/NEWS
@@ -8,6 +8,8 @@ PHP                                                                        NEWS
     (Jeremie Courreges-Anglas)
   . Fixed bug GH-12073 (Segfault when freeing incompletely initialized
     closures). (ilutov)
+  . Fixed bug GH-12060 (Internal iterator rewind handler is called twice).
+    (ju1ius)
 
 - DOM:
   . Fix memory leak when setting an invalid DOMDocument encoding. (nielsdos)
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
@@ -585,6 +585,7 @@ ZEND_METHOD(InternalIterator, rewind) {
 		RETURN_THROWS();
 	}
 
+	intern->rewind_called = 1;
 	if (!intern->iter->funcs->rewind) {
 		/* Allow calling rewind() if no iteration has happened yet,
 		 * even if the iterator does not support rewinding. */

Original file line number	Diff line number	Diff line change
`@@ -585,6 +585,7 @@ ZEND_METHOD(InternalIterator, rewind) {`
`585`	`585`	`RETURN_THROWS();`
`586`	`586`	`}`
`587`	`587`
	`588`	`+ intern->rewind_called = 1;`
`588`	`589`	`if (!intern->iter->funcs->rewind) {`
`589`	`590`	`/* Allow calling rewind() if no iteration has happened yet,`
`590`	`591`	`* even if the iterator does not support rewinding. */`