com php-src: Fixed uninitialized variables: Zend/zend_vm_de f.h Zend/zend_vm_execute.h

Commit: a3c8fbdd120f4ee61e91aabb6706ebd55efaf790 Author: Dmitry Stogov <dmitry@zend.com> Fri, 27 Jun 2014 21:13:05 +0400 Parents: 31087ee8b07337020702af4388e3795662cb45b3 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3c8fbdd120f4ee61e91aabb6706ebd55efaf790 Log: Fixed uninitialized variables 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 eaa6810...2a9af52 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2427,9 +2427,11 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV) if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) { zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(function_name)); } - fbc = Z_FUNC_P(func); STR_FREE(lcname); FREE_OP2(); + fbc = Z_FUNC_P(func); + called_scope = NULL; + object = NULL; } else if (OP2_TYPE != IS_CONST && OP2_TYPE != IS_TMP_VAR && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 374eea5..80aefc1 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1508,9 +1508,11 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) { zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(function_name)); } - fbc = Z_FUNC_P(func); STR_FREE(lcname); + fbc = Z_FUNC_P(func); + called_scope = NULL; + object = NULL; } else if (IS_CONST != IS_CONST && IS_CONST != IS_TMP_VAR && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -1834,9 +1836,11 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) { zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(function_name)); } - fbc = Z_FUNC_P(func); STR_FREE(lcname); zval_dtor(free_op2.var); + fbc = Z_FUNC_P(func); + called_scope = NULL; + object = NULL; } else if (IS_TMP_VAR != IS_CONST && IS_TMP_VAR != IS_TMP_VAR && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -2005,9 +2009,11 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) { zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(function_name)); } - fbc = Z_FUNC_P(func); STR_FREE(lcname); zval_ptr_dtor_nogc(free_op2.var); + fbc = Z_FUNC_P(func); + called_scope = NULL; + object = NULL; } else if (IS_VAR != IS_CONST && IS_VAR != IS_TMP_VAR && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) && @@ -2214,9 +2220,11 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) { zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(function_name)); } - fbc = Z_FUNC_P(func); STR_FREE(lcname); + fbc = Z_FUNC_P(func); + called_scope = NULL; + object = NULL; } else if (IS_CV != IS_CONST && IS_CV != IS_TMP_VAR && EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) && Z_OBJ_HANDLER_P(function_name, get_closure) &&