Skip to content

Commit 8a26237

Browse files
committed
set value to NULL
1 parent d32c71b commit 8a26237

File tree

2 files changed

+37
-13
lines changed

2 files changed

+37
-13
lines changed

ext/intl/resourcebundle/resourcebundle_iterator.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ static void resourcebundle_iterator_key( zend_object_iterator *iter, zval *key )
109109
ZVAL_STRING(key, iterator->currentkey);
110110
} else {
111111
ZVAL_NULL(key);
112+
ZVAL_NULL(&iterator->current);
112113
}
113114
} else {
114115
ZVAL_LONG(key, iterator->i);

ext/intl/tests/gh17317.phpt

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,42 @@ KidFlo
77
--FILE--
88
<?php
99
foreach ((new ResourceBundle('', NULL))->get('calendar')->get('buddhist') as $key => $value) {
10-
echo($key), PHP_EOL;
10+
echo "KEY: "; var_dump($key);
11+
echo "VALUE: "; var_dump($value);
1112
}
1213
?>
1314
--EXPECT--
14-
AmPmMarkersAbbr
15-
AmPmMarkersAbbr
16-
DateTimePatterns
17-
18-
19-
appendItems
20-
availableFormats
21-
dayNames
22-
eras
23-
intervalFormats
24-
monthNames
25-
quarters
15+
KEY: string(15) "AmPmMarkersAbbr"
16+
VALUE: object(ResourceBundle)#3 (0) {
17+
}
18+
KEY: string(15) "AmPmMarkersAbbr"
19+
VALUE: object(ResourceBundle)#4 (0) {
20+
}
21+
KEY: string(16) "DateTimePatterns"
22+
VALUE: object(ResourceBundle)#3 (0) {
23+
}
24+
KEY: NULL
25+
VALUE: NULL
26+
KEY: NULL
27+
VALUE: NULL
28+
KEY: string(11) "appendItems"
29+
VALUE: object(ResourceBundle)#3 (0) {
30+
}
31+
KEY: string(16) "availableFormats"
32+
VALUE: object(ResourceBundle)#4 (0) {
33+
}
34+
KEY: string(8) "dayNames"
35+
VALUE: object(ResourceBundle)#3 (0) {
36+
}
37+
KEY: string(4) "eras"
38+
VALUE: object(ResourceBundle)#4 (0) {
39+
}
40+
KEY: string(15) "intervalFormats"
41+
VALUE: object(ResourceBundle)#3 (0) {
42+
}
43+
KEY: string(10) "monthNames"
44+
VALUE: object(ResourceBundle)#4 (0) {
45+
}
46+
KEY: string(8) "quarters"
47+
VALUE: object(ResourceBundle)#3 (0) {
48+
}

0 commit comments

Comments
 (0)