From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 20 Aug 2014 06:43:37 +0000 (+0400)
Subject: fixed memory leak
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ea7e4e4e2b137fa3d9e4338e31ab0b752404a0d;p=php

fixed memory leak
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 34e317c9c0..c71a0b7ed3 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4551,6 +4551,9 @@ ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
 				    (Z_ISREF_P(array_ref) &&
 				     Z_REFCOUNTED_P(array_ptr) &&
 				     Z_REFCOUNT_P(array_ptr) > 1)) {
+					if (!Z_IMMUTABLE_P(array_ptr)) {
+						Z_DELREF_P(array_ptr);
+					}
 					zval_copy_ctor(array_ptr);
 				}
 				Z_ADDREF_P(array_ref);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index ad879ed777..40dab7a2d2 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -3165,6 +3165,9 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 				    (Z_ISREF_P(array_ref) &&
 				     Z_REFCOUNTED_P(array_ptr) &&
 				     Z_REFCOUNT_P(array_ptr) > 1)) {
+					if (!Z_IMMUTABLE_P(array_ptr)) {
+						Z_DELREF_P(array_ptr);
+					}
 					zval_copy_ctor(array_ptr);
 				}
 				Z_ADDREF_P(array_ref);
@@ -8685,6 +8688,9 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG
 				    (Z_ISREF_P(array_ref) &&
 				     Z_REFCOUNTED_P(array_ptr) &&
 				     Z_REFCOUNT_P(array_ptr) > 1)) {
+					if (!Z_IMMUTABLE_P(array_ptr)) {
+						Z_DELREF_P(array_ptr);
+					}
 					zval_copy_ctor(array_ptr);
 				}
 				Z_ADDREF_P(array_ref);
@@ -14128,6 +14134,9 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG
 				    (Z_ISREF_P(array_ref) &&
 				     Z_REFCOUNTED_P(array_ptr) &&
 				     Z_REFCOUNT_P(array_ptr) > 1)) {
+					if (!Z_IMMUTABLE_P(array_ptr)) {
+						Z_DELREF_P(array_ptr);
+					}
 					zval_copy_ctor(array_ptr);
 				}
 				Z_ADDREF_P(array_ref);
@@ -31489,6 +31498,9 @@ static int ZEND_FASTCALL  ZEND_FE_RESET_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 				    (Z_ISREF_P(array_ref) &&
 				     Z_REFCOUNTED_P(array_ptr) &&
 				     Z_REFCOUNT_P(array_ptr) > 1)) {
+					if (!Z_IMMUTABLE_P(array_ptr)) {
+						Z_DELREF_P(array_ptr);
+					}
 					zval_copy_ctor(array_ptr);
 				}
 				Z_ADDREF_P(array_ref);