From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 21 Mar 2014 17:48:38 +0000 (+0400)
Subject: Cleanup
X-Git-Tag: POST_PHPNG_MERGE~412^2~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c36294c4daa419d6e31f1deb47ab2009bdd3fa3a;p=php

Cleanup
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 963481541b..37bd9107b7 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5597,7 +5597,7 @@ ZEND_VM_HANDLER(159, ZEND_DISCARD_EXCEPTION, ANY, ANY)
 {
 	if (EX(delayed_exception) != NULL) {
 		/* discard the previously thrown exception */
-//???		zval_ptr_dtor(EX(delayed_exception));
+		OBJ_RELEASE(EX(delayed_exception));
 		EX(delayed_exception) = NULL;
 	}
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 46394f49c2..c61ad64045 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1323,7 +1323,7 @@ static int ZEND_FASTCALL  ZEND_DISCARD_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLE
 {
 	if (EX(delayed_exception) != NULL) {
 		/* discard the previously thrown exception */
-//???		zval_ptr_dtor(EX(delayed_exception));
+		OBJ_RELEASE(EX(delayed_exception));
 		EX(delayed_exception) = NULL;
 	}