cvs: php-src(PHP_5_1) / NEWS /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests bug36743.phpt

From: Date: Fri, 17 Mar 2006 10:15:58 +0000
Subject: cvs: php-src(PHP_5_1) / NEWS /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests bug36743.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-37311@lists.php.net to get a copy of this message
tony2001 Fri Mar 17 10:15:58 2006 UTC Added files: (Branch: PHP_5_1) /php-src/ext/xmlreader/tests bug36743.phpt Modified files: /php-src NEWS /php-src/ext/xmlreader php_xmlreader.c Log: fix #36743 (In a class extending XMLReader array properties are not writable) http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.464&r2=1.2027.2.465&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.464 php-src/NEWS:1.2027.2.465 --- php-src/NEWS:1.2027.2.464 Fri Mar 17 08:58:51 2006 +++ php-src/NEWS Fri Mar 17 10:15:58 2006 @@ -7,6 +7,8 @@ - Added overflow checks to wordwrap() function. (Ilia) - Removed the E_STRICT deprecation notice from "var". (Ilia) - Fixed debug_zval_dump() to support private and protected members. (Dmitry) +- Fixed bug #36743 (In a class extending XMLReader array properties are not + writable). (Tony) - Fixed bug #36697 (Transparency is lost when using imagecreatetruecolor). (Pierre) - Fixed bug #36629 (SoapServer::handle() exits on SOAP faults). (Dmitry) http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.13.2.10&r2=1.13.2.11&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.13.2.10 php-src/ext/xmlreader/php_xmlreader.c:1.13.2.11 --- php-src/ext/xmlreader/php_xmlreader.c:1.13.2.10 Mon Feb 6 11:28:41 2006 +++ php-src/ext/xmlreader/php_xmlreader.c Fri Mar 17 10:15:58 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.13.2.10 2006/02/06 11:28:41 tony2001 Exp $ */ +/* $Id: php_xmlreader.c,v 1.13.2.11 2006/03/17 10:15:58 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -110,6 +110,40 @@ } /* }}} */ +/* {{{ xmlreader_get_property_ptr_ptr */ +zval **xmlreader_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) +{ + xmlreader_object *obj; + zval tmp_member; + zval **retval = NULL; + xmlreader_prop_handler *hnd; + zend_object_handlers *std_hnd; + int ret = FAILURE; + + if (member->type != IS_STRING) { + tmp_member = *member; + zval_copy_ctor(&tmp_member); + convert_to_string(&tmp_member); + member = &tmp_member; + } + + obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC); + + if (obj->prop_handler != NULL) { + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + } + if (ret == FAILURE) { + std_hnd = zend_get_std_object_handlers(); + retval = std_hnd->get_property_ptr_ptr(object, member TSRMLS_CC); + } + + if (member == &tmp_member) { + zval_dtor(member); + } + return retval; +} +/* }}} */ + /* {{{ xmlreader_read_property */ zval *xmlreader_read_property(zval *object, zval *member, int type TSRMLS_DC) { @@ -1098,7 +1132,7 @@ memcpy(&xmlreader_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); xmlreader_object_handlers.read_property = xmlreader_read_property; xmlreader_object_handlers.write_property = xmlreader_write_property; - xmlreader_object_handlers.get_property_ptr_ptr = NULL; + xmlreader_object_handlers.get_property_ptr_ptr = xmlreader_get_property_ptr_ptr; INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions); ce.create_object = xmlreader_objects_new; http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/tests/bug36743.phpt?view=markup&rev=1.1 Index: php-src/ext/xmlreader/tests/bug36743.phpt +++ php-src/ext/xmlreader/tests/bug36743.phpt

« previous php.cvs (#37311) next »