Implement more cleanup

ndossche · ndossche · commit 6f5a6369f48c · 2024-12-11T21:51:23.000+01:00
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -3112,7 +3112,10 @@ zval *spl_iterator_zip_get_current_data(zend_object_iterator *iter)
 			data = zend_hash_get_current_data_ex(current->array, &current->hash_position_or_tag);
 		}
 		if (UNEXPECTED(data == NULL)) {
-			// TODO: cleanup the work we already did (and make sure no memory is uninit)
+			for (uint32_t j = 0; j < i; j++) {
+				zval_ptr_dtor(&array->arPacked[j]);
+				ZVAL_UNDEF(&array->arPacked[j]);
+			}
 			return NULL;
 		}
 		ZVAL_COPY(&array->arPacked[i], data);

Original file line number	Diff line number	Diff line change
`@@ -3112,7 +3112,10 @@ zval spl_iterator_zip_get_current_data(zend_object_iterator iter)`
`3112`	`3112`	`data = zend_hash_get_current_data_ex(current->array, &current->hash_position_or_tag);`
`3113`	`3113`	`}`
`3114`	`3114`	`if (UNEXPECTED(data == NULL)) {`
`3115`		`- // TODO: cleanup the work we already did (and make sure no memory is uninit)`
	`3115`	`+ for (uint32_t j = 0; j < i; j++) {`
	`3116`	`+ zval_ptr_dtor(&array->arPacked[j]);`
	`3117`	`+ ZVAL_UNDEF(&array->arPacked[j]);`
	`3118`	`+ }`
`3116`	`3119`	`return NULL;`
`3117`	`3120`	`}`
`3118`	`3121`	`ZVAL_COPY(&array->arPacked[i], data);`