Skip to content

Commit 652d77e

Browse files
committed
fix #36743 (In a class extending XMLReader array properties are not writable)
1 parent 76a7240 commit 652d77e

File tree

3 files changed

+62
-1
lines changed

3 files changed

+62
-1
lines changed

NEWS

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ PHP NEWS
77
- Added overflow checks to wordwrap() function. (Ilia)
88
- Removed the E_STRICT deprecation notice from "var". (Ilia)
99
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
10+
- Fixed bug #36743 (In a class extending XMLReader array properties are not
11+
writable). (Tony)
1012
- Fixed bug #36697 (Transparency is lost when using imagecreatetruecolor).
1113
(Pierre)
1214
- Fixed bug #36629 (SoapServer::handle() exits on SOAP faults). (Dmitry)

ext/xmlreader/php_xmlreader.c

+35-1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,40 @@ static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handl
110110
}
111111
/* }}} */
112112

113+
/* {{{ xmlreader_get_property_ptr_ptr */
114+
zval **xmlreader_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC)
115+
{
116+
xmlreader_object *obj;
117+
zval tmp_member;
118+
zval **retval = NULL;
119+
xmlreader_prop_handler *hnd;
120+
zend_object_handlers *std_hnd;
121+
int ret = FAILURE;
122+
123+
if (member->type != IS_STRING) {
124+
tmp_member = *member;
125+
zval_copy_ctor(&tmp_member);
126+
convert_to_string(&tmp_member);
127+
member = &tmp_member;
128+
}
129+
130+
obj = (xmlreader_object *)zend_objects_get_address(object TSRMLS_CC);
131+
132+
if (obj->prop_handler != NULL) {
133+
ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd);
134+
}
135+
if (ret == FAILURE) {
136+
std_hnd = zend_get_std_object_handlers();
137+
retval = std_hnd->get_property_ptr_ptr(object, member TSRMLS_CC);
138+
}
139+
140+
if (member == &tmp_member) {
141+
zval_dtor(member);
142+
}
143+
return retval;
144+
}
145+
/* }}} */
146+
113147
/* {{{ xmlreader_read_property */
114148
zval *xmlreader_read_property(zval *object, zval *member, int type TSRMLS_DC)
115149
{
@@ -1098,7 +1132,7 @@ PHP_MINIT_FUNCTION(xmlreader)
10981132
memcpy(&xmlreader_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
10991133
xmlreader_object_handlers.read_property = xmlreader_read_property;
11001134
xmlreader_object_handlers.write_property = xmlreader_write_property;
1101-
xmlreader_object_handlers.get_property_ptr_ptr = NULL;
1135+
xmlreader_object_handlers.get_property_ptr_ptr = xmlreader_get_property_ptr_ptr;
11021136

11031137
INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions);
11041138
ce.create_object = xmlreader_objects_new;

ext/xmlreader/tests/bug36743.phpt

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
--TEST--
2+
Bug #36743 (In a class extending XMLReader array properties are not writable)
3+
--FILE--
4+
<?php
5+
6+
class Test extends XMLReader
7+
{
8+
private $testArr = array();
9+
public function __construct()
10+
{
11+
$this->testArr[] = 1;
12+
var_dump($this->testArr);
13+
}
14+
}
15+
16+
$t = new test;
17+
18+
echo "Done\n";
19+
?>
20+
--EXPECT--
21+
array(1) {
22+
[0]=>
23+
int(1)
24+
}
25+
Done

0 commit comments

Comments
 (0)