mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 02:44:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed wrong fix for bug #41582

Browse Source
This commit is contained in:
Dmitry Stogov 2007-06-13 13:38:26 +00:00
parent 62849e3fee
commit f018ec9024
4 changed files with 100 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
ext/simplexml/simplexml.c
View File

@ -249,18 +249,16 @@ static zval * sxe_prop_dim_read(zval *object, zval *member, zend_bool elements,
int nodendx = 0; int nodendx = 0;
int test = 0; int test = 0;
if (!member) {
return_value = &EG(uninitialized_zval);
return_value->is_ref = 1;
return return_value;
}
sxe = php_sxe_fetch_object(object TSRMLS_CC); sxe = php_sxe_fetch_object(object TSRMLS_CC);
if (Z_TYPE_P(member) == IS_LONG) { if (!member || Z_TYPE_P(member) == IS_LONG) {
if (sxe->iter.type != SXE_ITER_ATTRLIST) { if (sxe->iter.type != SXE_ITER_ATTRLIST) {
attribs = 0; attribs = 0;
elements = 1; elements = 1;
} else if (!member) {
/* This happens when the user did: $sxe[]->foo = $value */
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot create unnamed attribute");
return NULL;
} }
name = NULL; name = NULL;
} else { } else {
@ -288,6 +286,12 @@ static zval * sxe_prop_dim_read(zval *object, zval *member, zend_bool elements,
node = php_sxe_get_first_node(sxe, node TSRMLS_CC); node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
attr = node ? node->properties : NULL; attr = node ? node->properties : NULL;
test = 0; test = 0;
if (!member && node && node->parent &&
node->parent->type == XML_DOCUMENT_NODE) {
/* This happens when the user did: $sxe[]->foo = $value */
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot create unnamed attribute");
return NULL;
}
} }
if (node) { if (node) {
@ -320,13 +324,30 @@ static zval * sxe_prop_dim_read(zval *object, zval *member, zend_bool elements,
if (!sxe->node) { if (!sxe->node) {
php_libxml_increment_node_ptr((php_libxml_node_object *)sxe, node, NULL TSRMLS_CC); php_libxml_increment_node_ptr((php_libxml_node_object *)sxe, node, NULL TSRMLS_CC);
} }
if (Z_TYPE_P(member) == IS_LONG) { if (!member || Z_TYPE_P(member) == IS_LONG) {
long cnt = 0;
xmlNodePtr mynode = node;
if (sxe->iter.type == SXE_ITER_CHILD) { if (sxe->iter.type == SXE_ITER_CHILD) {
node = php_sxe_get_first_node(sxe, node TSRMLS_CC); node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
} }
node = sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, NULL); if (sxe->iter.type == SXE_ITER_NONE) {
if (member && Z_LVAL_P(member) > 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only 0 such elements exist", mynode->name, Z_LVAL_P(member));
}
} else if (member) {
node = sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, &cnt);
} else {
node = NULL;
}
if (node) { if (node) {
_node_as_zval(sxe, node, return_value, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC); _node_as_zval(sxe, node, return_value, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC);
} else if (type == BP_VAR_W || type == BP_VAR_RW) {
if (member && cnt < Z_LVAL_P(member)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only %ld such elements exist", mynode->name, Z_LVAL_P(member), cnt);
}
node = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, NULL);
_node_as_zval(sxe, node, return_value, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix TSRMLS_CC);
} }
} else { } else {
#if SXE_ELEMENT_BY_NAME #if SXE_ELEMENT_BY_NAME
@ -431,7 +452,6 @@ static void change_node_zval(xmlNodePtr node, zval *value TSRMLS_DC)
static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode TSRMLS_DC) static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_bool elements, zend_bool attribs, xmlNodePtr *pnewnode TSRMLS_DC)
{ {
php_sxe_object *sxe; php_sxe_object *sxe;
char *name;
xmlNodePtr node; xmlNodePtr node;
xmlNodePtr newnode = NULL; xmlNodePtr newnode = NULL;
xmlNodePtr mynode; xmlNodePtr mynode;
@ -445,7 +465,13 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
long cnt = 0; long cnt = 0;
zval tmp_zv, trim_zv, value_copy; zval tmp_zv, trim_zv, value_copy;
if (!member) { sxe = php_sxe_fetch_object(object TSRMLS_CC);
if (!member || Z_TYPE_P(member) == IS_LONG) {
if (sxe->iter.type != SXE_ITER_ATTRLIST) {
attribs = 0;
elements = 1;
} else if (!member) {
/* This happens when the user did: $sxe[] = $value /* This happens when the user did: $sxe[] = $value
* and could also be E_PARSE, but we use this only during parsing * and could also be E_PARSE, but we use this only during parsing
* and this is during runtime. * and this is during runtime.
@ -453,15 +479,6 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot create unnamed attribute"); php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot create unnamed attribute");
return; return;
} }
sxe = php_sxe_fetch_object(object TSRMLS_CC);
if (Z_TYPE_P(member) == IS_LONG) {
if (sxe->iter.type != SXE_ITER_ATTRLIST) {
attribs = 0;
elements = 1;
}
} else { } else {
if (Z_TYPE_P(member) != IS_STRING) { if (Z_TYPE_P(member) != IS_STRING) {
trim_zv = *member; trim_zv = *member;
@ -481,8 +498,6 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
} }
} }
name = Z_STRVAL_P(member);
GET_NODE(sxe, node); GET_NODE(sxe, node);
if (sxe->iter.type == SXE_ITER_ATTRLIST) { if (sxe->iter.type == SXE_ITER_ATTRLIST) {
@ -496,6 +511,15 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
node = php_sxe_get_first_node(sxe, node TSRMLS_CC); node = php_sxe_get_first_node(sxe, node TSRMLS_CC);
attr = node ? node->properties : NULL; attr = node ? node->properties : NULL;
test = 0; test = 0;
if (!member && node && node->parent &&
node->parent->type == XML_DOCUMENT_NODE) {
/* This happens when the user did: $sxe[] = $value
* and could also be E_PARSE, but we use this only during parsing
* and this is during runtime.
*/
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot create unnamed attribute");
return;
}
if (attribs && !node && sxe->iter.type == SXE_ITER_ELEMENT) { if (attribs && !node && sxe->iter.type == SXE_ITER_ELEMENT) {
node = xmlNewChild(mynode, mynode->ns, sxe->iter.name, NULL); node = xmlNewChild(mynode, mynode->ns, sxe->iter.name, NULL);
attr = node->properties; attr = node->properties;
@ -552,7 +576,7 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
} }
} else { } else {
while (attr) { while (attr) {
if ((!test || !xmlStrcmp(attr->name, sxe->iter.name)) && !xmlStrcmp(attr->name, (xmlChar *)name) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) { if ((!test || !xmlStrcmp(attr->name, sxe->iter.name)) && !xmlStrcmp(attr->name, (xmlChar *)Z_STRVAL_P(member)) && match_ns(sxe, (xmlNodePtr) attr, sxe->iter.nsprefix, sxe->iter.isprefix)) {
is_attr = 1; is_attr = 1;
++counter; ++counter;
break; break;
@ -564,17 +588,30 @@ static void sxe_prop_dim_write(zval *object, zval *member, zval *value, zend_boo
} }
if (elements) { if (elements) {
if (Z_TYPE_P(member) == IS_LONG) { if (!member || Z_TYPE_P(member) == IS_LONG) {
if (node->type == XML_ATTRIBUTE_NODE) {
php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot create duplicate attribute");
return;
}
if (sxe->iter.type == SXE_ITER_NONE) {
newnode = node;
++counter;
if (member && Z_LVAL_P(member) > 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only 0 such elements exist", mynode->name, Z_LVAL_P(member));
}
} else if (member) {
newnode = sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, &cnt); newnode = sxe_get_element_by_offset(sxe, Z_LVAL_P(member), node, &cnt);
if (newnode) { if (newnode) {
++counter; ++counter;
} }
}
} else { } else {
node = node->children; node = node->children;
while (node) { while (node) {
SKIP_TEXT(node); SKIP_TEXT(node);
if (!xmlStrcmp(node->name, (xmlChar *)name)) { if (!xmlStrcmp(node->name, (xmlChar *)Z_STRVAL_P(member))) {
newnode = node; newnode = node;
++counter; ++counter;
} }
@ -600,15 +637,23 @@ next_iter:
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)"); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot assign to an array of nodes (duplicate subnodes or attr detected)");
} else if (elements) { } else if (elements) {
if (!node) { if (!node) {
newnode = xmlNewTextChild(mynode, mynode->ns, (xmlChar *)name, value ? (xmlChar *)Z_STRVAL_P(value) : NULL); if (!member || Z_TYPE_P(member) == IS_LONG) {
} else if (Z_TYPE_P(member) == IS_LONG) { newnode = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, value ? (xmlChar *)Z_STRVAL_P(value) : NULL);
if (cnt < Z_LVAL_P(member)) { } else {
newnode = xmlNewTextChild(mynode, mynode->ns, (xmlChar *)Z_STRVAL_P(member), value ? (xmlChar *)Z_STRVAL_P(value) : NULL);
}
} else if (!member || Z_TYPE_P(member) == IS_LONG) {
if (member && cnt < Z_LVAL_P(member)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only %ld such elements exist", mynode->name, Z_LVAL_P(member), cnt); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot add element %s number %ld when only %ld such elements exist", mynode->name, Z_LVAL_P(member), cnt);
} }
newnode = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, value ? (xmlChar *)Z_STRVAL_P(value) : NULL); newnode = xmlNewTextChild(mynode->parent, mynode->ns, mynode->name, value ? (xmlChar *)Z_STRVAL_P(value) : NULL);
} }
} else if (attribs) { } else if (attribs) {
newnode = (xmlNodePtr)xmlNewProp(node, (xmlChar *)name, value ? (xmlChar *)Z_STRVAL_P(value) : NULL); if (Z_TYPE_P(member) == IS_LONG) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot change attribute number %ld when only %d attributes exist", Z_LVAL_P(member), nodendx);
} else {
newnode = (xmlNodePtr)xmlNewProp(node, (xmlChar *)Z_STRVAL_P(member), value ? (xmlChar *)Z_STRVAL_P(value) : NULL);
}
} }
} }

14
ext/simplexml/tests/027.phpt
View File

@ -40,7 +40,7 @@ $people->person[3] = 'Minni-me';
$people->person[2]['gender'] = 'male'; $people->person[2]['gender'] = 'male';
traverse_xml($people); traverse_xml($people);
$people->person[3]['gender'] = 'error'; $people->person[3]['gender'] = 'error';
traverse_xml($people);
?> ?>
===DONE=== ===DONE===
--EXPECTF-- --EXPECTF--
@ -70,6 +70,14 @@ Warning: main(): Cannot add element person number 3 when only 2 such elements ex
<person gender="male">Minni-me <person gender="male">Minni-me
</person> </person>
</people> </people>
<people>
Notice: Indirect modification of overloaded element of SimpleXMLElement has no effect in %s027.php on line %d <person gender="female">Jane
</person>
<person gender="male">Joe
</person>
<person gender="male">Minni-me
</person>
<person gender="error">
</person>
</people>
===DONE=== ===DONE===

17
ext/simplexml/tests/bug35785.phpt
View File

@ -8,13 +8,13 @@ Bug #35785 (SimpleXML memory read error)
$xml = simplexml_load_string("<root></root>"); $xml = simplexml_load_string("<root></root>");
$xml->bla->posts->name = "FooBar"; $xml->bla->posts->name = "FooBar";
echo $xml->asXML(); echo $xml->asXML();
echo "===FAIL===\n";
$xml = simplexml_load_string("<root></root>"); $xml = simplexml_load_string("<root></root>");
$count = count($xml->bla->posts); $count = count($xml->bla->posts);
var_dump($count); var_dump($count);
$xml->bla->posts[++$count]->name = "FooBar"; $xml->bla->posts[$count]->name = "FooBar";
echo $xml->asXML();
$xml = simplexml_load_string("<root></root>");
$xml->bla->posts[]->name = "FooBar";
echo $xml->asXML(); echo $xml->asXML();
?> ?>
===DONE=== ===DONE===
@ -22,12 +22,9 @@ echo $xml->asXML();
--EXPECTF-- --EXPECTF--
<?xml version="1.0"?> <?xml version="1.0"?>
<root><bla><posts><name>FooBar</name></posts></bla></root> <root><bla><posts><name>FooBar</name></posts></bla></root>
===FAIL===
int(0) int(0)
Notice: Indirect modification of overloaded element of SimpleXMLElement has no effect in %sbug35785.php on line %d
Strict Standards: Creating default object from empty value in %sbug35785.php on line %d
<?xml version="1.0"?> <?xml version="1.0"?>
<root><bla><posts/></bla></root> <root><bla><posts><name>FooBar</name></posts></bla></root>
<?xml version="1.0"?>
<root><bla><posts><name>FooBar</name></posts></bla></root>
===DONE=== ===DONE===

8
ext/simplexml/tests/bug41582.phpt
View File

@ -8,9 +8,11 @@ $xml = new SimpleXMLElement('<?xml version="1.0" standalone="yes"?>
$xml->movie[]->characters->character[0]->name = 'Miss Coder'; $xml->movie[]->characters->character[0]->name = 'Miss Coder';
var_dump($xml->asXml()); echo($xml->asXml());
echo "Done\n"; echo "Done\n";
?> ?>
--EXPECTF-- --EXPECT--
Fatal error: Cannot use object of type stdClass as array in %s on line %d <?xml version="1.0" standalone="yes"?>
<collection><movie><characters><character><name>Miss Coder</name></character></characters></movie></collection>
Done