Fixed memory leak

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 83e74bc8ac127e05b82a4244270086dc543843bd..3941df2b6e899c593b02f4e96a95eee667b0b8b5 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -5444,6 +5444,10 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMPVAR|CV, ANY)
        }
        FREE_OP1();
        if (UNEXPECTED(EG(exception) != NULL)) {
+               if (new_op_array != NULL) {
+                       destroy_op_array(new_op_array);
+                       efree_size(new_op_array, sizeof(zend_op_array));
+               }
                HANDLE_EXCEPTION();
        } else if (EXPECTED(new_op_array != NULL)) {
                zval *return_value = NULL;

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 174c6de1c1445e6f8cb8cecc69cb99f1a89dd705..d8197ee9f197d3cfe1cc49cb5163c2c343143435 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3637,6 +3637,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HAN
        }
 
        if (UNEXPECTED(EG(exception) != NULL)) {
+               if (new_op_array != NULL) {
+                       destroy_op_array(new_op_array);
+                       efree_size(new_op_array, sizeof(zend_op_array));
+               }
                HANDLE_EXCEPTION();
        } else if (EXPECTED(new_op_array != NULL)) {
                zval *return_value = NULL;
@@ -29298,6 +29302,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLE
        }
 
        if (UNEXPECTED(EG(exception) != NULL)) {
+               if (new_op_array != NULL) {
+                       destroy_op_array(new_op_array);
+                       efree_size(new_op_array, sizeof(zend_op_array));
+               }
                HANDLE_EXCEPTION();
        } else if (EXPECTED(new_op_array != NULL)) {
                zval *return_value = NULL;
@@ -40830,6 +40838,10 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMPVAR_HA
        }
        zval_ptr_dtor_nogc(free_op1);
        if (UNEXPECTED(EG(exception) != NULL)) {
+               if (new_op_array != NULL) {
+                       destroy_op_array(new_op_array);
+                       efree_size(new_op_array, sizeof(zend_op_array));
+               }
                HANDLE_EXCEPTION();
        } else if (EXPECTED(new_op_array != NULL)) {
                zval *return_value = NULL;