cvs: ZendEngine2 / zend_execute.c

zeev Mon Jun 9 03:39:55 2003 EDT Modified files: /ZendEngine2 zend_execute.c Log: Fix indirect reference calls to bogus function names Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.470 ZendEngine2/zend_execute.c:1.471 --- ZendEngine2/zend_execute.c:1.470 Sun Jun 8 14:52:53 2003 +++ ZendEngine2/zend_execute.c Mon Jun 9 03:39:55 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.470 2003/06/08 18:52:53 zeev Exp $ */ +/* $Id: zend_execute.c,v 1.471 2003/06/09 07:39:55 zeev Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -2433,6 +2433,11 @@ zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + if (Z_TYPE_P(function_name)!=IS_STRING) { + zend_error(E_ERROR, "Method name must be a string"); + } + function_name_strval = function_name->value.str.val; function_name_strlen = function_name->value.str.len; @@ -2542,6 +2547,9 @@ } else { function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + if (Z_TYPE_P(function_name) != IS_STRING) { + zend_error(E_ERROR, "Function name must be a string"); + } function_name_strval = zend_str_tolower_dup(function_name->value.str.val, function_name->value.str.len); function_name_strlen = function_name->value.str.len; }