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

Fixed char/zend_string mesh

Browse source
This commit is contained in:
Dmitry Stogov 2014-02-22 00:31:39 +04:00
parent efae48d996
commit bc3fb147cf
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Zend/zend_API.c
View file

@ -2929,7 +2929,7 @@ get_function_via_handler:
!instanceof_function(ce_org, fcc->function_handler->common.scope TSRMLS_CC))) { !instanceof_function(ce_org, fcc->function_handler->common.scope TSRMLS_CC))) {
if ((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0) { if ((fcc->function_handler->common.fn_flags & ZEND_ACC_CALL_VIA_HANDLER) != 0) {
if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) { if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
efree((char*)fcc->function_handler->common.function_name); STR_RELEASE(fcc->function_handler->common.function_name);
} }
efree(fcc->function_handler); efree(fcc->function_handler);
} }
@ -2961,7 +2961,7 @@ get_function_via_handler:
if (fcc->calling_scope && !call_via_handler) { if (fcc->calling_scope && !call_via_handler) {
if (!fcc->object_ptr && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) { if (!fcc->object_ptr && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) {
if (error) { if (error) {
zend_spprintf(error, 0, "cannot call abstract method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); zend_spprintf(error, 0, "cannot call abstract method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val);
retval = 0; retval = 0;
} else { } else {
zend_error(E_ERROR, "Cannot call abstract method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val); zend_error(E_ERROR, "Cannot call abstract method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val);
@ -3008,7 +3008,7 @@ get_function_via_handler:
if (*error) { if (*error) {
efree(*error); efree(*error);
} }
zend_spprintf(error, 0, "cannot access private method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); zend_spprintf(error, 0, "cannot access private method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val);
} }
retval = 0; retval = 0;
} }
@ -3018,7 +3018,7 @@ get_function_via_handler:
if (*error) { if (*error) {
efree(*error); efree(*error);
} }
zend_spprintf(error, 0, "cannot access protected method %s::%s()", fcc->calling_scope->name, fcc->function_handler->common.function_name); zend_spprintf(error, 0, "cannot access protected method %s::%s()", fcc->calling_scope->name->val, fcc->function_handler->common.function_name->val);
} }
retval = 0; retval = 0;
} }
@ -3114,7 +3114,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY ||
fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) { fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) {
if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) { if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
efree((char*)fcc->function_handler->common.function_name); STR_RELEASE(fcc->function_handler->common.function_name);
} }
efree(fcc->function_handler); efree(fcc->function_handler);
} }
@ -3192,7 +3192,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval *object_ptr, uint ch
fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY ||
fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) { fcc->function_handler->type == ZEND_OVERLOADED_FUNCTION)) {
if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) { if (fcc->function_handler->type != ZEND_OVERLOADED_FUNCTION) {
efree((char*)fcc->function_handler->common.function_name); STR_RELEASE(fcc->function_handler->common.function_name);
} }
efree(fcc->function_handler); efree(fcc->function_handler);
} }
@ -3270,7 +3270,7 @@ ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRML
fcc.function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY || fcc.function_handler->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY ||
fcc.function_handler->type == ZEND_OVERLOADED_FUNCTION)) { fcc.function_handler->type == ZEND_OVERLOADED_FUNCTION)) {
if (fcc.function_handler->type != ZEND_OVERLOADED_FUNCTION) { if (fcc.function_handler->type != ZEND_OVERLOADED_FUNCTION) {
efree((char*)fcc.function_handler->common.function_name); STR_RELEASE(fcc.function_handler->common.function_name);
} }
efree(fcc.function_handler); efree(fcc.function_handler);
} }

2
Zend/zend_vm_def.h
View file

@ -1968,7 +1968,7 @@ ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
} }
if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) { if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {
efree((char*)fbc->common.function_name); STR_RELEASE(fbc->common.function_name);
} }
efree(fbc); efree(fbc);

2
Zend/zend_vm_execute.h
View file

@ -602,7 +602,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR
} }
if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) { if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {
efree((char*)fbc->common.function_name); STR_RELEASE(fbc->common.function_name);
} }
efree(fbc); efree(fbc);