php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-12 02:23:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Fixed bug #78903: Conflict in RTD key for closures results in crash
This commit is contained in:
Nikita Popov
2019-12-11 13:08:12 +01:00
parent 05e6a11b5b b55033fa18
commit 33648585d6
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Zend/zend_compile.c
View File

@@ -6079,7 +6079,7 @@ void zend_begin_method_decl(zend_op_array *op_array, zend_string *name, zend_boo
}
/* }}} */
static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
static int zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_ast_decl *decl, zend_bool toplevel) /* {{{ */
{
zend_string *unqualified_name, *name, *lcname, *key;
zend_op *opline;
@@ -6114,12 +6114,10 @@ static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_as
do_bind_function_error(lcname, op_array, 1);
}
zend_string_release_ex(lcname, 0);
return;
return SUCCESS;
}
key = zend_build_runtime_definition_key(lcname, decl->lex_pos);
zend_hash_update_ptr(CG(function_table), key, op_array);
if (op_array->fn_flags & ZEND_ACC_CLOSURE) {
opline = zend_emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL);
opline->extended_value = zend_alloc_cache_slot();
@@ -6134,6 +6132,8 @@ static void zend_begin_func_decl(znode *result, zend_op_array *op_array, zend_as
zend_add_literal_string(&key);
}
zend_string_release_ex(lcname, 0);
return zend_hash_add_ptr(CG(function_table), key, op_array) != NULL ? SUCCESS : FAILURE;
}
/* }}} */
@@ -6179,7 +6179,13 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /*
zend_bool has_body = stmt_ast != NULL;
zend_begin_method_decl(op_array, decl->name, has_body);
} else {
zend_begin_func_decl(result, op_array, decl, toplevel);
if (zend_begin_func_decl(result, op_array, decl, toplevel) == FAILURE) {
/* A function with this RTD key is already registered.
* Fail gracefully by reusing the existing function. */
destroy_op_array(op_array);
return;
}
if (decl->kind == ZEND_AST_ARROW_FUNC) {
find_implicit_binds(&info, params_ast, stmt_ast);
compile_implicit_lexical_binds(&info, result, op_array);