archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add zend_string_concat2 API

Browse source
This commit is contained in:
Nikita Popov 2020-04-14 17:17:38 +02:00
parent 489a51bff0
commit 4fb705a03d
6 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Zend/zend_API.c
View file

@ -3137,11 +3137,9 @@ try_again:
case IS_OBJECT:
{
zend_class_entry *ce = Z_OBJCE_P(callable);
zend_string *callable_name = zend_string_alloc(
ZSTR_LEN(ce->name) + sizeof("::__invoke") - 1, 0);
memcpy(ZSTR_VAL(callable_name), ZSTR_VAL(ce->name), ZSTR_LEN(ce->name));
memcpy(ZSTR_VAL(callable_name) + ZSTR_LEN(ce->name), "::__invoke", sizeof("::__invoke"));
return callable_name;
return zend_string_concat2(
ZSTR_VAL(ce->name), ZSTR_LEN(ce->name),
"::__invoke", sizeof("::__invoke") - 1);
}
case IS_REFERENCE:
callable = Z_REFVAL_P(callable);