Fixed bug #29566 (foreach/string handling strangeness (crash)).

diff --git a/NEWS b/NEWS
index a9c8d9dc095251bdd099f34379bcee8bd1c71ca1..277048dac8869b368366127e25d80f1478e8989c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,7 @@ PHP                                                                        NEWS
 - Fixed bug #29657 (xml_* functions throw non descriptive error). 
   (Christian, Rob)
 - Fixed bug #29656 (segfault on result and statement properties). (Georg)
+- Fixed bug #29566 (foreach/string handling strangeness (crash)). (Dmitry)
 - Fixed bug #29447 (Reflection API issues). (Marcus)
 - Fixed bug #29296 (Added sslv2 and sslv3 transports). (Wez)
 - Fixed bug #29283 (Invalid statement handle in mysqli on execute). (Georg)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 0c205b86fc3b6d4625cf004008853871c9967746..2e69f5a1c78a68b1190c2b4c329854ff7e9f44a5 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -3709,7 +3709,7 @@ int zend_fe_reset_handler(ZEND_OPCODE_HANDLER_ARGS)
        if (opline->extended_value) {
                array_ptr_ptr = get_zval_ptr_ptr(&opline->op1, EX(Ts), BP_VAR_R);
                if (array_ptr_ptr == NULL) {
-                       MAKE_STD_ZVAL(array_ptr);
+                       ALLOC_INIT_ZVAL(array_ptr);
                } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) {
                        ce = Z_OBJCE_PP(array_ptr_ptr);
                        if (!ce || ce->get_iterator == NULL) {