RE: [ZEND-ENGINE-CVS] cvs: ZendEngine2(PHP_5_1) / zend_API.c

Hi Marcus, This patch breaks some tests. Zend/tests/bug32290.phpt ext/sqlite/tests/sqlitr_oo_030.phpt ext/standard/tests/tests/general_functions/bug32647.phpt Seems the wrong code is: + if (!*zobj_ptr_ptr && (!*fptr_ptr || !((*fptr_ptr)->common.fn_flags & ZEND_ACC_STATIC))) { + retval = 0; + } HEAD doesn't contain it. Please remove this code or wrap it with IS_CALLABLE_CHECK_STATIC. Thanks. Dmitry. > -----Original Message----- > From: Marcus Boerger [mailto:helly@php.net] > Sent: Wednesday, November 02, 2005 11:30 PM > To: zend-engine-cvs@lists.php.net > Subject: [ZEND-ENGINE-CVS] cvs: ZendEngine2(PHP_5_1) / zend_API.c > > > helly Wed Nov 2 15:30:22 2005 EDT > > Modified files: (Branch: PHP_5_1) > /ZendEngine2 zend_API.c > Log: > - Add missing cases and checks > > > http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.296.2. > 7&r2=1.296.2.8&ty=u > Index: ZendEngine2/zend_API.c > diff -u ZendEngine2/zend_API.c:1.296.2.7 > ZendEngine2/zend_API.c:1.296.2.8 > --- ZendEngine2/zend_API.c:1.296.2.7 Fri Oct 28 10:46:29 2005 > +++ ZendEngine2/zend_API.c Wed Nov 2 15:30:13 2005 > @@ -18,7 +18,7 @@ > > +------------------------------------------------------------- > ---------+ > */ > > -/* $Id: zend_API.c,v 1.296.2.7 2005/10/28 14:46:29 dmitry Exp $ */ > +/* $Id: zend_API.c,v 1.296.2.8 2005/11/02 20:30:13 helly Exp $ */ > > #include "zend.h" > #include "zend_execute.h" > @@ -1951,12 +1951,13 @@ > > ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint > check_flags, char **callable_name, int *callable_name_len, > zend_class_entry **ce_ptr, zend_function **fptr_ptr, zval > ***zobj_ptr_ptr TSRMLS_DC) { > - char *lcname; > + char *lcname, *lmname, *colon; > zend_bool retval = 0; > - int callable_name_len_local; > - zend_class_entry *ce_local; > + int callable_name_len_local, clen, mlen; > + zend_class_entry *ce_local, **pce; > zend_function *fptr_local; > zval **zobj_ptr_local; > + HashTable *ftable; > > if (callable_name_len == NULL) { > callable_name_len = &callable_name_len_local; > @@ -1983,17 +1984,41 @@ > if (check_flags & > IS_CALLABLE_CHECK_SYNTAX_ONLY) { > return 1; > } > + > + if ((colon = > strstr(Z_STRVAL_P(callable), "::")) != NULL) { > + clen = colon - Z_STRVAL_P(callable); > + mlen = Z_STRLEN_P(callable) - clen - 2; > + lcname = > estrndup(Z_STRVAL_P(callable), clen); > + lcname[clen] = '\0'; > + lmname = > zend_str_tolower_dup(Z_STRVAL_P(callable) + clen + 2, mlen); > + if (zend_lookup_class(lcname, > clen, &pce TSRMLS_CC) == FAILURE) { > + efree(lcname); > + efree(lmname); > + return 0; > + } > + *ce_ptr = *pce; > + ftable = &(*ce_ptr)->function_table; > + } else { > + mlen = Z_STRLEN_P(callable); > + lmname = > zend_str_tolower_dup(Z_STRVAL_P(callable), mlen); > + ftable = EG(function_table); > + } > > - lcname = > zend_str_tolower_dup(Z_STRVAL_P(callable), Z_STRLEN_P(callable)); > - if (zend_hash_find(EG(function_table), > lcname, Z_STRLEN_P(callable)+1, (void**)fptr_ptr) == SUCCESS) { > + if (zend_hash_find(ftable, lmname, > mlen+1, (void**)fptr_ptr) == > +SUCCESS) { > retval = 1; > } > - efree(lcname); > + if (*ce_ptr) { > + efree(lcname); > + if > (!((*fptr_ptr)->common.fn_flags & ZEND_ACC_STATIC)) { > + retval = 0; > + } > + } > + efree(lmname); > break; > > case IS_ARRAY: > { > - zend_class_entry *ce = NULL, **pce; > + zend_class_entry *ce = NULL; > zval **method; > zval **obj; > > @@ -2021,17 +2046,17 @@ > return 1; > } > > - lcname = > zend_str_tolower_dup(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj)); > - > - if > (EG(active_op_array) && strcmp(lcname, "self") == 0) { > - ce = > EG(active_op_array)->scope; > - } else if > (strcmp(lcname, "parent") == 0 && EG(active_op_array) && > EG(active_op_array)->scope) { > - ce = > EG(active_op_array)->scope->parent; > - } else if > (zend_lookup_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), &pce > TSRMLS_CC) == SUCCESS) { > + if > (zend_lookup_class(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), &pce > +TSRMLS_CC) == SUCCESS) { > ce = *pce; > + } else if > (EG(active_op_array)) { > + lcname > = zend_str_tolower_dup(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj)); > + if > (Z_STRLEN_PP(obj) == sizeof("self") - 1 && memcmp(lcname, > "self", sizeof("self")) == 0) { > + > ce = EG(active_op_array)->scope; > + } else > if (Z_STRLEN_PP(obj) == sizeof("parent") - 1 && > memcmp(lcname, "parent", sizeof("parent")) == 0 && > EG(active_op_array)->scope) { > + > ce = EG(active_op_array)->scope->parent; > + } > + efree(lcname); > } > - > - efree(lcname); > } else { > ce = > Z_OBJCE_PP(obj); /* TBFixed: what if it's overloaded? */ > > @@ -2090,6 +2115,9 @@ > *callable_name = > estrndup("Array", sizeof("Array")-1); > *callable_name_len = > sizeof("Array") - 1; > } > + if (!*zobj_ptr_ptr && > (!*fptr_ptr || !((*fptr_ptr)->common.fn_flags & ZEND_ACC_STATIC))) { > + retval = 0; > + } > *ce_ptr = ce; > } > break; > > -- > Zend Engine CVS Mailing List (http://cvs.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >