cvs: ZendEngine2 / zend_builtin_functions.c

helly Fri Apr 15 14:53:17 2005 EDT Modified files: /ZendEngine2 zend_builtin_functions.c Log: - Fix even though we already know that the function will be renamed http://cvs.php.net/diff.php/ZendEngine2/zend_builtin_functions.c?r1=1.263&r2=1.264&ty=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.263 ZendEngine2/zend_builtin_functions.c:1.264 --- ZendEngine2/zend_builtin_functions.c:1.263 Fri Apr 8 09:33:15 2005 +++ ZendEngine2/zend_builtin_functions.c Fri Apr 15 14:53:11 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.263 2005/04/08 13:33:15 helly Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.264 2005/04/15 18:53:11 helly Exp $ */ #include "zend.h" #include "zend_API.h" @@ -904,9 +904,15 @@ ZEND_WRONG_PARAM_COUNT(); } convert_to_string_ex(property); + if (!Z_STRLEN_PP(property)) { + RETURN_FALSE; + } switch((*object)->type) { case IS_STRING: + if (!Z_STRLEN_PP(object)) { + RETURN_FALSE; + } if (zend_lookup_class(Z_STRVAL_PP(object), Z_STRLEN_PP(object), &pce TSRMLS_CC) == SUCCESS) { ce = *pce; } @@ -941,7 +947,7 @@ RETURN_FALSE; default: - zend_error(E_WARNING, "Parameter must either be an object or the name of an existing class"); + zend_error(E_WARNING, "First parameter must either be an object or the name of an existing class"); RETURN_NULL(); } }