php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #76712: Assignment of empty string creates extraneous text node

Browse Source 
We work around this peculiarity of libxml by using xmlNodeSetContent(),
which does not exhibit this behavior.  This also saves us from manually
calculating the string length.
This commit is contained in:
Christoph M. Becker
2018-08-07 11:37:58 +02:00
parent fcf4088d3f
commit 692e5d5c88
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/simplexml/simplexml.c
+1 -3
View File
@@ -384,7 +384,6 @@ static zval *sxe_dimension_read(zval *object, zval *offset, int type, zval *rv)
static void change_node_zval(xmlNodePtr node, zval *value)
{
xmlChar *buffer;
int buffer_len;
if (!value)
{
@@ -401,10 +400,9 @@ static void change_node_zval(xmlNodePtr node, zval *value)
/* break missing intentionally */
case IS_STRING:
buffer = xmlEncodeEntitiesReentrant(node->doc, (xmlChar *)Z_STRVAL_P(value));
buffer_len = xmlStrlen(buffer);
/* check for NULL buffer in case of memory error in xmlEncodeEntitiesReentrant */
if (buffer) {
xmlNodeSetContentLen(node, buffer, buffer_len);
xmlNodeSetContent(node, buffer);
xmlFree(buffer);
}
break;
ext/simplexml/tests/bug76712.phpt
+24
View File
@@ -0,0 +1,24 @@
--TEST--
BUg #76712 (Assignment of empty string creates extraneous text node)
--SKIPIF--
<?php
if (!extension_loaded('simplexml')) die('skip simplexml not available');
?>
--FILE--
<?php
$sxe = new SimpleXMLElement('<foo></foo>');
$sxe->addChild('bar', '');
echo $sxe->asXML();
$sxe = new SimpleXMLElement('<foo></foo>');
$sxe->addChild('bar');
$sxe->bar = '';
echo $sxe->asXML();
?>
===DONE===
--EXPECT--
<?xml version="1.0"?>
<foo><bar/></foo>
<?xml version="1.0"?>
<foo><bar/></foo>
===DONE===