Fix GH-17317: ResourceBundle crash on undefined iterator key.

devnexen · devnexen · commit 39d4c63a3ced · 2025-01-01T16:57:57.000Z
diff --git a/ext/intl/resourcebundle/resourcebundle_iterator.c b/ext/intl/resourcebundle/resourcebundle_iterator.c
@@ -105,7 +105,11 @@ static void resourcebundle_iterator_key( zend_object_iterator *iter, zval *key )
 	}
 
 	if (iterator->is_table) {
-		ZVAL_STRING(key, iterator->currentkey);
+		if (EXPECTED(iterator->currentkey)) {
+			ZVAL_STRING(key, iterator->currentkey);
+		} else {
+			ZVAL_NULL(key);
+		}
 	} else {
 		ZVAL_LONG(key, iterator->i);
 	}

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,11 @@ static void resourcebundle_iterator_key( zend_object_iterator iter, zval key )`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`if (iterator->is_table) {`
`108`		`- ZVAL_STRING(key, iterator->currentkey);`
	`108`	`+ if (EXPECTED(iterator->currentkey)) {`
	`109`	`+ ZVAL_STRING(key, iterator->currentkey);`
	`110`	`+ } else {`
	`111`	`+ ZVAL_NULL(key);`
	`112`	`+ }`
`109`	`113`	`} else {`
`110`	`114`	`ZVAL_LONG(key, iterator->i);`
`111`	`115`	`}`