mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-20 10:43:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #38424 (Different attribute assignment if new or existing)

Browse Source 
add test
This commit is contained in:
Rob Richards 2006-08-14 11:57:50 +00:00
parent 3048cd7558
commit a0c941aad1
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/simplexml/simplexml.c
View File

@ -366,6 +366,8 @@ static zval * sxe_dimension_read(zval *object, zval *offset, int type TSRMLS_DC)
static void change_node_zval(xmlNodePtr node, zval *value TSRMLS_DC)
{
zval value_copy;
xmlChar *buffer;
int buffer_len;
if (!value)
{
@ -385,7 +387,20 @@ static void change_node_zval(xmlNodePtr node, zval *value TSRMLS_DC)
convert_to_string(value);
/* break missing intentionally */
case IS_STRING:
xmlNodeSetContentLen(node, (xmlChar *)Z_STRVAL_P(value), Z_STRLEN_P(value));
if (node->type == XML_ATTRIBUTE_NODE) {
buffer = xmlEncodeEntitiesReentrant(node->doc, (xmlChar *)Z_STRVAL_P(value));
buffer_len = xmlStrlen(buffer);
} else {
buffer = (xmlChar *)Z_STRVAL_P(value);
buffer_len = Z_STRLEN_P(value);
}
/* check for NULL buffer in case of memory error in xmlEncodeEntitiesReentrant */
if (buffer) {
xmlNodeSetContentLen(node, buffer, buffer_len);
if (node->type == XML_ATTRIBUTE_NODE) {
xmlFree(buffer);
}
}
if (value == &value_copy) {
zval_dtor(value);
}

26
ext/simplexml/tests/bug38424.phpt Normal file
View File

@ -0,0 +1,26 @@
--TEST--
Bug #38424 (Different attribute assignment if new or exists)
--SKIPIF--
<?php if (!extension_loaded("simplexml")) print "skip"; ?>
--FILE--
<?php
$xml = simplexml_load_string('<xml></xml>');
$str = "abc & def" ;
$xml["a1"] = "" ;
$xml["a1"] = htmlspecialchars($str,ENT_NOQUOTES) ;
$xml["a2"] = htmlspecialchars($str,ENT_NOQUOTES) ;
$xml["a3"] = "" ;
$xml["a3"] = $str ;
$xml["a4"] = $str ;
echo $xml->asXML();
?>
--EXPECT--
<?xml version="1.0"?>
<xml a1="abc &amp;amp; def" a2="abc &amp;amp; def" a3="abc &amp; def" a4="abc &amp; def"/>