cvs: ZendEngine2(PHP_5_2) / zend_builtin_functions.c /tests bug42211.phpt php-src NEWS

dmitry Wed Aug 8 13:32:46 2007 UTC Added files: (Branch: PHP_5_2) /ZendEngine2/tests bug42211.phpt Modified files: /php-src NEWS /ZendEngine2 zend_builtin_functions.c Log: Fixed bug #42211 (property_exists() fails to find protected properties from a parent class) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.886&r2=1.2027.2.547.2.887&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.886 php-src/NEWS:1.2027.2.547.2.887 --- php-src/NEWS:1.2027.2.547.2.886 Wed Aug 8 13:01:39 2007 +++ php-src/NEWS Wed Aug 8 13:32:46 2007 @@ -5,6 +5,8 @@ streams). (andrew dot minerd at sellingsource dot com, Ilia) - Fixed bug #42233 (Problems with æøå in extract()). (Jani) - Fixed bug #42222 (possible buffer overflow in php_openssl_make_REQ). (Pierre) +- Fixed bug #42211 (property_exists() fails to find protected properties from + a parent class). (Dmitry) - Fixed bug #42208 (substr_replace() crashes when the same array is passed more than once). (crrodriguez at suse dot de, Ilia) - Fixed bug #42198 (SCRIPT_NAME and PHP_SELF truncated when inside a userdir http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.22&r2=1.277.2.12.2.23&diff_format=u Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.22 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.23 --- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.22 Thu Aug 2 20:32:44 2007 +++ ZendEngine2/zend_builtin_functions.c Wed Aug 8 13:32:46 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.22 2007/08/02 20:32:44 tony2001 Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.23 2007/08/08 13:32:46 dmitry Exp $ */ #include "zend.h" #include "zend_API.h" @@ -979,7 +979,8 @@ } zend_unmangle_property_name(property_info->name, property_info->name_length, &class_name, &prop_name); if (!strncmp(class_name, "*", 1)) { - if (instanceof_function(EG(scope), ce TSRMLS_CC)) { + if (instanceof_function(EG(scope), ce TSRMLS_CC) || + (EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC))) { RETURN_TRUE; } RETURN_FALSE; http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug42211.phpt?view=markup&rev=1.1 Index: ZendEngine2/tests/bug42211.phpt +++ ZendEngine2/tests/bug42211.phpt