From: Dmitry Stogov Date: Thu, 6 Mar 2014 20:26:21 +0000 (+0400) Subject: Fixed memory leak X-Git-Tag: POST_PHPNG_MERGE~412^2~384 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70260d133ec37b66d62296b1cd95551b8ad31990;p=php Fixed memory leak --- diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index bc2d2763b4..d917f6843d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -401,7 +401,7 @@ ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index c1330dae30..acf8b9dffa 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -14063,7 +14063,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CONST(int (*b } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -16542,7 +16542,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_TMP(int (*bin } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -18599,7 +18599,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_VAR(int (*bin } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -20768,7 +20768,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_UNUSED(int (* } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -22174,7 +22174,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_VAR_CV(int (*bina } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -24084,7 +24084,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CONST(int } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -25475,7 +25475,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_TMP(int (* } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -26783,7 +26783,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_VAR(int (* } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -28092,7 +28092,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_UNUSED(int } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -28499,7 +28499,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_UNUSED_CV(int (*b } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -31307,7 +31307,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CONST(int (*bi } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -33568,7 +33568,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_TMP(int (*bina } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -35500,7 +35500,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_VAR(int (*bina } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -37543,7 +37543,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_UNUSED(int (*b } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) { @@ -38815,7 +38815,7 @@ static int ZEND_FASTCALL zend_binary_assign_op_obj_helper_SPEC_CV_CV(int (*binar } z = value; } - if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); +//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z); SEPARATE_ZVAL_IF_NOT_REF(z); binary_op(z, z, value TSRMLS_CC); if (opline->extended_value == ZEND_ASSIGN_OBJ) {