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

Avoid function copying

Browse Source
This commit is contained in:
Dmitry Stogov
2018-08-27 12:47:32 +03:00
parent e42e8b1051
commit 02eded868c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Zend/zend_compile.c
View File

@@ -1057,21 +1057,21 @@ ZEND_API int do_bind_function(zval *lcname) /* {{{ */
rtd_key = lcname + 1;
zv = zend_hash_find_ex(EG(function_table), Z_STR_P(rtd_key), 1);
function = (zend_function*)Z_PTR_P(zv);
new_function = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
memcpy(new_function, function, sizeof(zend_op_array));
if (zend_hash_add_ptr(EG(function_table), Z_STR_P(lcname), new_function) == NULL) {
do_bind_function_error(Z_STR_P(lcname), &new_function->op_array, 0);
return FAILURE;
} else {
new_function = function = (zend_function*)Z_PTR_P(zv);
if (function->op_array.static_variables
&& !(function->op_array.fn_flags & ZEND_ACC_IMMUTABLE)) {
new_function = zend_arena_alloc(&CG(arena), sizeof(zend_op_array));
memcpy(new_function, function, sizeof(zend_op_array));
function->op_array.static_variables = NULL; /* NULL out the unbound function */
if (function->op_array.refcount) {
(*function->op_array.refcount)++;
}
if (!(function->op_array.fn_flags & ZEND_ACC_IMMUTABLE)) {
function->op_array.static_variables = NULL; /* NULL out the unbound function */
}
return SUCCESS;
}
if (UNEXPECTED(zend_hash_add_ptr(EG(function_table), Z_STR_P(lcname), new_function) == NULL)) {
do_bind_function_error(Z_STR_P(lcname), &new_function->op_array, 0);
return FAILURE;
}
return SUCCESS;
}
/* }}} */