]> granicus.if.org Git - php/commitdiff
Cleanup
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Mar 2014 17:48:38 +0000 (21:48 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Mar 2014 17:48:38 +0000 (21:48 +0400)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index 963481541ba59967f26cc5f5f5cbb4213089d5af..37bd9107b704b358a9ae387e99aa32fe0f57c8b5 100644 (file)
@@ -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;
        }
 
index 46394f49c2d5414dd9d2ec9683e9e8180cc49402..c61ad640450241df0dbc99ce171a029ff512dd90 100644 (file)
@@ -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;
        }