com php-src: Fix segfault in token_get_all_variation1 9.phpt: Zend/zend_vm_def.h Zend/zend_vm_exe cute.h

From: Date: Sat, 18 Nov 2017 23:48:48 +0000
Subject: com php-src: Fix segfault in token_get_all_variation1 9.phpt: Zend/zend_vm_def.h Zend/zend_vm_exe cute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100303@lists.php.net to get a copy of this message
Commit: 23b61f78a691b5bd47ac86ae0f420c9533d9d4ce Author: Alessandro Chitolina <alekitto@gmail.com> Sat, 18 Nov 2017 20:47:31 +0100 Committer: Nikita Popov <nikita.ppv@gmail.com> Sun, 19 Nov 2017 00:48:48 +0100 Parents: c57a2dccae3b0c49e9b7df4ab912beb84ca31699 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=23b61f78a691b5bd47ac86ae0f420c9533d9d4ce Log: Fix segfault in token_get_all_variation19.phpt 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 4039348..ebdca64 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2835,7 +2835,7 @@ ZEND_VM_HANDLER(54, ZEND_ROPE_INIT, UNUSED, CONST|TMPVAR|CV, NUM) var = GET_OP2_ZVAL_PTR(BP_VAR_R); rope[0] = Z_STR_P(var); if (UNEXPECTED(Z_REFCOUNTED_P(var))) { - Z_ADDREF_P(Z_STR_P(var)); + Z_ADDREF_P(var); } } else { var = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index ec9507e..6f1a607 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -28280,7 +28280,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ROPE_INIT_SPEC_UNUSED_CONST_HA var = RT_CONSTANT(opline, opline->op2); rope[0] = Z_STR_P(var); if (UNEXPECTED(Z_REFCOUNTED_P(var))) { - Z_ADDREF_P(Z_STR_P(var)); + Z_ADDREF_P(var); } } else { var = RT_CONSTANT(opline, opline->op2); @@ -30904,7 +30904,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ROPE_INIT_SPEC_UNUSED_CV_HANDL var = _get_zval_ptr_cv_BP_VAR_R(opline->op2.var EXECUTE_DATA_CC); rope[0] = Z_STR_P(var); if (UNEXPECTED(Z_REFCOUNTED_P(var))) { - Z_ADDREF_P(Z_STR_P(var)); + Z_ADDREF_P(var); } } else { var = _get_zval_ptr_cv_undef(opline->op2.var EXECUTE_DATA_CC); @@ -32651,7 +32651,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ROPE_INIT_SPEC_UNUSED_TMPVAR_H var = _get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC); rope[0] = Z_STR_P(var); if (UNEXPECTED(Z_REFCOUNTED_P(var))) { - Z_ADDREF_P(Z_STR_P(var)); + Z_ADDREF_P(var); } } else { var = _get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC);

« previous php.cvs (#100303) next »