cvs: php-src /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests bug36743.phpt

From: Date: Fri, 17 Mar 2006 10:17:36 +0000
Subject: cvs: php-src /ext/xmlreader php_xmlreader.c /ext/xmlreader/tests bug36743.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-37312@lists.php.net to get a copy of this message
tony2001 Fri Mar 17 10:17:36 2006 UTC Modified files: /php-src/ext/xmlreader php_xmlreader.c /php-src/ext/xmlreader/tests bug36743.phpt Log: MFB: fix #36743 (In a class extending XMLReader array properties are not writable) http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlreader/php_xmlreader.c?r1=1.27&r2=1.28&diff_format=u Index: php-src/ext/xmlreader/php_xmlreader.c diff -u php-src/ext/xmlreader/php_xmlreader.c:1.27 php-src/ext/xmlreader/php_xmlreader.c:1.28 --- php-src/ext/xmlreader/php_xmlreader.c:1.27 Mon Feb 6 11:28:20 2006 +++ php-src/ext/xmlreader/php_xmlreader.c Fri Mar 17 10:17:36 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_xmlreader.c,v 1.27 2006/02/06 11:28:20 tony2001 Exp $ */ +/* $Id: php_xmlreader.c,v 1.28 2006/03/17 10:17:36 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -109,6 +109,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) { @@ -1121,7 +1155,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?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/xmlreader/tests/bug36743.phpt diff -u /dev/null php-src/ext/xmlreader/tests/bug36743.phpt:1.2 --- /dev/null Fri Mar 17 10:17:36 2006 +++ php-src/ext/xmlreader/tests/bug36743.phpt Fri Mar 17 10:17:36 2006 @@ -0,0 +1,25 @@ +--TEST-- +Bug #36743 (In a class extending XMLReader array properties are not writable) +--FILE-- +<?php + +class Test extends XMLReader +{ + private $testArr = array(); + public function __construct() + { + $this->testArr[] = 1; + var_dump($this->testArr); + } +} + +$t = new test; + +echo "Done\n"; +?> +--EXPECT-- +array(1) { + [0]=> + int(1) +} +Done

« previous php.cvs (#37312) next »