]> granicus.if.org Git - php/commitdiff
Fixed iterator dtor
authorDmitry Stogov <dmitry@zend.com>
Thu, 20 Mar 2014 19:28:24 +0000 (23:28 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 20 Mar 2014 19:28:24 +0000 (23:28 +0400)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index d98087ac5ec15d8cd00d1f7c29360268ac76a4e7..ca6bdba410a68d030070e502b439728d092f1cef 100644 (file)
@@ -3346,7 +3346,8 @@ again:
                        }
 
 ZEND_VM_C_LABEL(unpack_iter_dtor):
-                       iter->funcs->dtor(iter TSRMLS_CC);
+//???                  iter->funcs->dtor(iter TSRMLS_CC);
+                       zend_iterator_dtor(iter TSRMLS_CC);
                        break;
                }
                case IS_REFERENCE:
index f8429bccfe109a76ab51a922ea0635b0f31a4aee..379fbcb9270076377ceacfb679cd47cabd0f9138 100644 (file)
@@ -824,7 +824,8 @@ again:
                        }
 
 unpack_iter_dtor:
-                       iter->funcs->dtor(iter TSRMLS_CC);
+//???                  iter->funcs->dtor(iter TSRMLS_CC);
+                       zend_iterator_dtor(iter TSRMLS_CC);
                        break;
                }
                case IS_REFERENCE: