From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 8 Jun 2005 18:54:04 +0000 (+0000)
Subject: Fixed exception handling in getIterator() callback (bugs #26229 & #30725)
X-Git-Tag: php-5.0.1b1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87df726f05799c7eb82358d0823ea7d1fceb24b4;p=php

Fixed exception handling in getIterator() callback (bugs #26229 & #30725)
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a876a10a47..748a9cbab2 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2964,7 +2964,6 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
 		if (iter && !EG(exception)) {
 			array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
 		} else {
-			zval_ptr_dtor(&array_ptr);
 			if (opline->extended_value) {
 				FREE_OP1_VAR_PTR();
 			} else {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 719d206fe2..fe9013517e 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1974,7 +1974,6 @@ static int ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		if (iter && !EG(exception)) {
 			array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
 		} else {
-			zval_ptr_dtor(&array_ptr);
 			if (opline->extended_value) {
 				;
 			} else {
@@ -4416,7 +4415,6 @@ static int ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		if (iter && !EG(exception)) {
 			array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
 		} else {
-			zval_ptr_dtor(&array_ptr);
 			if (opline->extended_value) {
 				;
 			} else {
@@ -7516,7 +7514,6 @@ static int ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		if (iter && !EG(exception)) {
 			array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
 		} else {
-			zval_ptr_dtor(&array_ptr);
 			if (opline->extended_value) {
 				if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 			} else {
@@ -19575,7 +19572,6 @@ static int ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		if (iter && !EG(exception)) {
 			array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
 		} else {
-			zval_ptr_dtor(&array_ptr);
 			if (opline->extended_value) {
 				;
 			} else {
@@ -32642,7 +32638,6 @@ static int ZEND_FE_RESET_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 		if (iter && !EG(exception)) {
 			array_ptr = zend_iterator_wrap(iter TSRMLS_CC);
 		} else {
-			zval_ptr_dtor(&array_ptr);
 			if (opline->extended_value) {
 				if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
 			} else {