clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for Zend/tests/bug46238.phpt

Browse Source
This commit is contained in:
Dmitry Stogov 2014-04-12 00:50:36 +04:00
parent c6af3781ee
commit b178992cd1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Zend/zend_object_handlers.c
View File

@ -1024,7 +1024,13 @@ static inline union _zend_function *zend_get_user_call_function(zend_class_entry
call_user_call->num_args = 0;
call_user_call->scope = ce;
call_user_call->fn_flags = ZEND_ACC_CALL_VIA_HANDLER;
call_user_call->function_name = STR_COPY(method_name);
//??? keep compatibility for "\0" characters
//??? see: Zend/tests/bug46238.phpt
if (UNEXPECTED(strlen(method_name->val) != method_name->len)) {
call_user_call->function_name = STR_INIT(method_name->val, strlen(method_name->val), 0);
} else {
call_user_call->function_name = STR_COPY(method_name);
}
return (union _zend_function *)call_user_call;
}
@ -1157,7 +1163,13 @@ static inline union _zend_function *zend_get_user_callstatic_function(zend_class
callstatic_user_call->num_args = 0;
callstatic_user_call->scope = ce;
callstatic_user_call->fn_flags = ZEND_ACC_STATIC | ZEND_ACC_PUBLIC | ZEND_ACC_CALL_VIA_HANDLER;
callstatic_user_call->function_name = STR_COPY(method_name);
//??? keep compatibility for "\0" characters
//??? see: Zend/tests/bug46238.phpt
if (UNEXPECTED(strlen(method_name->val) != method_name->len)) {
callstatic_user_call->function_name = STR_INIT(method_name->val, strlen(method_name->val), 0);
} else {
callstatic_user_call->function_name = STR_COPY(method_name);
}
return (zend_function *)callstatic_user_call;
}