cvs: ZendEngine2 / zend_builtin_functions.c
| From: | Marcus Boerger | Date: | Sun, 17 Apr 2005 20:16:14 +0000 |
| Subject: | cvs: ZendEngine2 / zend_builtin_functions.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-3570@lists.php.net to get a copy of this message | ||
helly Sun Apr 17 16:16:14 2005 EDT
Modified files:
/ZendEngine2 zend_builtin_functions.c
Log:
- Fix special cases of property_exists()
http://cvs.php.net/diff.php/ZendEngine2/zend_builtin_functions.c?r1=1.265&r2=1.266&ty=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.265 ZendEngine2/zend_builtin_functions.c:1.266
--- ZendEngine2/zend_builtin_functions.c:1.265 Sat Apr 16 11:24:56 2005
+++ ZendEngine2/zend_builtin_functions.c Sun Apr 17 16:16:14 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_builtin_functions.c,v 1.265 2005/04/16 15:24:56 pollita Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.266 2005/04/17 20:16:14 helly Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -916,6 +916,8 @@
}
if (zend_lookup_class(Z_STRVAL_PP(object), Z_STRLEN_PP(object), &pce TSRMLS_CC) == SUCCESS) {
ce = *pce;
+ } else {
+ RETURN_FALSE;
}
if (!ce) {
RETURN_NULL();
@@ -942,7 +944,7 @@
RETURN_FALSE;
case IS_OBJECT:
- if (Z_OBJ_HANDLER_PP(object, has_property) && Z_OBJ_HANDLER_PP(object,
has_property)(*object, *property, 1 TSRMLS_CC)) {
+ if (Z_OBJ_HANDLER_PP(object, has_property) && Z_OBJ_HANDLER_PP(object,
has_property)(*object, *property, 0 TSRMLS_CC)) {
RETURN_TRUE;
}
RETURN_FALSE;