cvs: ZendEngine2 / zend_execute.c zend_object_handlers.c

zeev Wed Jan 29 10:02:58 2003 EDT Modified files: /ZendEngine2 zend_execute.c zend_object_handlers.c Log: Code rearrangements Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.415 ZendEngine2/zend_execute.c:1.416 --- ZendEngine2/zend_execute.c:1.415 Wed Jan 29 03:55:12 2003 +++ ZendEngine2/zend_execute.c Wed Jan 29 10:02:55 2003 @@ -2413,7 +2413,6 @@ 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)) { Index: ZendEngine2/zend_object_handlers.c diff -u ZendEngine2/zend_object_handlers.c:1.27 ZendEngine2/zend_object_handlers.c:1.28 --- ZendEngine2/zend_object_handlers.c:1.27 Wed Jan 29 03:55:12 2003 +++ ZendEngine2/zend_object_handlers.c Wed Jan 29 10:02:57 2003 @@ -396,7 +396,7 @@ 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 @@ 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);