Skip to content

Fix bug #81468: Inconsistent default namespace inheritance #9179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix bug #81468: Inconsistent default namespace inheritance #9179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf3ef4b
fix bug #81468
NathanFreeman Jul 28, 2022
ed32f42
test
NathanFreeman Jul 28, 2022
404b95d
use xmlSetNs
NathanFreeman Jul 29, 2022
953fd74
fix #bug81468
NathanFreeman Aug 12, 2022
3e64d0b
fix #bug81468
NathanFreeman Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions ext/dom/node.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#endif

#include "php.h"

#if defined(HAVE_LIBXML) && defined(HAVE_DOM)
#include "php_dom.h"

Expand Down Expand Up @@ -976,6 +977,9 @@ PHP_METHOD(DOMNode, insertBefore)
new_child = _php_dom_insert_fragment(parentp, parentp->last, NULL, child, intern, childobj);
}
if (new_child == NULL) {
if (!child->ns && parentp->parent) {
xmlSetNs(child, parentp->ns);
}
new_child = xmlAddChild(parentp, child);
}
}
Expand Down Expand Up @@ -1220,6 +1224,9 @@ PHP_METHOD(DOMNode, appendChild)
}

if (new_child == NULL) {
if (!child->ns && nodep->parent) {
xmlSetNs(child, nodep->ns);
}
new_child = xmlAddChild(nodep, child);
if (new_child == NULL) {
// TODO Convert to Error?
Expand Down Expand Up @@ -1668,7 +1675,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
buf = xmlAllocOutputBuffer(NULL);
}

if (buf != NULL) {
if (buf != NULL) {
ret = xmlC14NDocSaveTo(docp, nodeset, exclusive, inclusive_ns_prefixes,
with_comments, buf);
}
Expand All @@ -1683,9 +1690,9 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
xmlXPathFreeContext(ctxp);
}

if (buf == NULL || ret < 0) {
RETVAL_FALSE;
} else {
if (buf == NULL || ret < 0) {
RETVAL_FALSE;
} else {
if (mode == 0) {
#ifdef LIBXML2_NEW_BUFFER
ret = xmlOutputBufferGetSize(buf);
Expand All @@ -1702,7 +1709,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
RETVAL_EMPTY_STRING();
}
}
}
}

if (buf) {
int bytes;
Expand Down
175 changes: 175 additions & 0 deletions ext/dom/tests/bug81468.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
--TEST--
Bug #81468 (Inconsistent default namespace inheritance)
--SKIPIF--
<?php
require_once('skipif.inc');
?>
--FILE--
<?php
$dom = new \DOMDocument();
$dom
->appendChild($dom->createElementNS('some:namespace', 'foo'))
->appendChild($dom->createElement('bar'));
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar')) . " should be 1\n\n";

$dom = new \DOMDocument();
$dom->loadXml($xml);
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar')) . " should be 1\n\n";


$dom = new \DOMDocument();
$dom
->appendChild($dom->createElementNS('some:namespace', 'foo'))
->appendChild($dom->createElementNS('some:namespace_test', 'bar'));
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
$xpath->registerNamespace('m', 'some:namespace_test');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/m:bar')) . " should be 1\n\n";

$dom = new \DOMDocument();
$dom->loadXml($xml);
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
$xpath->registerNamespace('m', 'some:namespace_test');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/m:bar')) . " should be 1\n\n";

$dom = new \DOMDocument();
$dom
->appendChild($dom->createElement('bar'))
->appendChild($dom->createElementNS('some:namespace', 'foo'));
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo count($xpath->query('/bar/n:foo')) . " should be 1\n";
echo count($xpath->query('/bar/foo')) . " should be 0\n\n";



$dom = new \DOMDocument();
$dom
->appendChild($dom->createElementNS('some:namespace', 'foo'))
->appendChild($dom->createElement('bar'))
->appendChild($dom->createElement('baz'));
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar')) . " should be 1\n";
echo count($xpath->query('/n:foo/n:bar/baz')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar/n:baz')) . " should be 1\n\n";

$dom = new \DOMDocument();
$dom->loadXml($xml);
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar')) . " should be 1\n";
echo count($xpath->query('/n:foo/n:bar/baz')) . " should be 0\n";
echo count($xpath->query('/n:foo/n:bar/n:baz')) . " should be 1\n\n";


$dom = new \DOMDocument();
$dom
->appendChild($dom->createElementNS('some:namespace', 'foo'))
->appendChild($dom->createElementNS('some:namespace_test', 'bar'))
->appendChild($dom->createElement('baz'));
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
$xpath->registerNamespace('m', 'some:namespace_test');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/m:bar')) . " should be 1\n";
echo count($xpath->query('/n:foo/m:bar/baz')) . " should be 0\n";
echo count($xpath->query('/n:foo/m:bar/m:baz')) . " should be 1\n\n";

$dom = new \DOMDocument();
$dom->loadXml($xml);
echo ($xml = $dom->saveXML());

$xpath = new \DOMXPath($dom);
$xpath->registerNamespace('n', 'some:namespace');
$xpath->registerNamespace('m', 'some:namespace_test');
echo count($xpath->query('/n:foo/bar')) . " should be 0\n";
echo count($xpath->query('/n:foo/m:bar')) . " should be 1\n";
echo count($xpath->query('/n:foo/m:bar/baz')) . " should be 0\n";
echo count($xpath->query('/n:foo/m:bar/m:baz')) . " should be 1\n\n";

?>
--EXPECT--
<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar/></foo>
0 should be 0
1 should be 1

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar/></foo>
0 should be 0
1 should be 1

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar xmlns="some:namespace_test"/></foo>
0 should be 0
0 should be 0
1 should be 1

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar xmlns="some:namespace_test"/></foo>
0 should be 0
0 should be 0
1 should be 1

<?xml version="1.0"?>
<bar><foo xmlns="some:namespace"/></bar>
1 should be 1
0 should be 0

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar><baz/></bar></foo>
0 should be 0
1 should be 1
0 should be 0
1 should be 1

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar><baz/></bar></foo>
0 should be 0
1 should be 1
0 should be 0
1 should be 1

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar xmlns="some:namespace_test"><baz/></bar></foo>
0 should be 0
1 should be 1
0 should be 0
1 should be 1

<?xml version="1.0"?>
<foo xmlns="some:namespace"><bar xmlns="some:namespace_test"><baz/></bar></foo>
0 should be 0
1 should be 1
0 should be 0
1 should be 1
Loading