diff options
| author | Zeev Suraski <zeev@php.net> | 2003-01-29 15:02:57 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2003-01-29 15:02:57 +0000 |
| commit | 4b97a8dffdd581672e780423aec5c5b2c129fc44 (patch) | |
| tree | 14e1ca1c014ec3c0ee8f0bbfc0d00dca57f1f21f /Zend | |
| parent | f73def91ed90dd422124a54ac7e05b670c0f43f0 (diff) | |
| download | php-git-4b97a8dffdd581672e780423aec5c5b2c129fc44.tar.gz | |
Code rearrangements
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute.c | 1 | ||||
| -rw-r--r-- | Zend/zend_object_handlers.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index dedc2e53fd..72548e6248 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2413,7 +2413,6 @@ int zend_init_method_call_handler(ZEND_OPCODE_HANDLER_ARGS) EX(object) = get_obj_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R TSRMLS_CC); if (EX(object) && EX(object)->type == IS_OBJECT) { - /* First, locate the function. */ EX(fbc) = Z_OBJ_HT_P(EX(object))->get_method(EX(object), function_name_strval, function_name_strlen TSRMLS_CC); if (!EX(fbc)) { diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index ff5764e6b0..b03aad9ac3 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -396,7 +396,7 @@ static union _zend_function *zend_std_get_method(zval *object, char *method_name zobj = Z_OBJ_P(object); if (zend_hash_find(&zobj->ce->function_table, lc_method_name, method_len+1, (void **)&func_method) == FAILURE) { - if (zobj->ce->__call != NULL) { + if (zobj->ce->__call) { zend_internal_function *call_user_call = emalloc(sizeof(zend_internal_function)); call_user_call->type = ZEND_INTERNAL_FUNCTION; call_user_call->handler = zend_std_call_user_call; @@ -407,8 +407,9 @@ static union _zend_function *zend_std_get_method(zval *object, char *method_name free_alloca(lc_method_name); return (union _zend_function *)call_user_call; + } else { + return NULL; } - zend_error(E_ERROR, "Call to undefined function %s()", method_name); } free_alloca(lc_method_name); |