com php-src: Fixed refcounting: Zend/zend_vm_def.h Zend /zend_vm_execute.h

Commit: a3abf6f291b5bf4fcec472dce8781facb98ecf93 Author: Dmitry Stogov <dmitry@zend.com> Fri, 21 Mar 2014 15:33:08 +0400 Parents: 7ce06ee5a7a216671c40169fc3326ca3f6fd92cc Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3abf6f291b5bf4fcec472dce8781facb98ecf93 Log: Fixed refcounting Changed paths: M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 509a5b5..9634815 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -1821,7 +1821,9 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV) } ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ASSIGN); } else if (OP2_TYPE == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - PZVAL_LOCK(value_ptr); + if (!OP2_FREE) { + PZVAL_LOCK(value_ptr); + } } if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) && diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index ed6ad2a..46394f4 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -19794,7 +19794,9 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDL } return ZEND_ASSIGN_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } else if (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - PZVAL_LOCK(value_ptr); + if (!(free_op2.var != NULL)) { + PZVAL_LOCK(value_ptr); + } } if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) && @@ -23240,7 +23242,9 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLE } return ZEND_ASSIGN_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } else if (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - PZVAL_LOCK(value_ptr); + if (!0) { + PZVAL_LOCK(value_ptr); + } } if (IS_VAR == IS_VAR && UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) && @@ -36829,7 +36833,9 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLE } return ZEND_ASSIGN_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } else if (IS_VAR == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - PZVAL_LOCK(value_ptr); + if (!(free_op2.var != NULL)) { + PZVAL_LOCK(value_ptr); + } } if (IS_CV == IS_VAR && UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) && @@ -40015,7 +40021,9 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER } return ZEND_ASSIGN_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); } else if (IS_CV == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) { - PZVAL_LOCK(value_ptr); + if (!0) { + PZVAL_LOCK(value_ptr); + } } if (IS_CV == IS_VAR && UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&