Skip to content

Fix GH-22825: DOM attribute methods on a DTD default attribute #22830

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
iliaal wants to merge 1 commit into from
+112 −3
Closed

Fix GH-22825: DOM attribute methods on a DTD default attribute #22830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ PHP NEWS
- Date:
. Fixed leak on double DatePeriod::__construct() call. (ilutov)

- DOM:
. Fixed bug GH-22825 (DOMElement::setAttribute() fails silently when the DTD
declares a default value for the attribute). (iliaal)

- Sockets:
. Fixed various memory related issues in ext/sockets. (David Carlier)

Expand Down
13 changes: 10 additions & 3 deletions ext/dom/element.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ PHP_METHOD(DOMElement, setAttribute)
break;
case XML_NAMESPACE_DECL:
RETURN_FALSE;
case XML_ATTRIBUTE_DECL:
break;
EMPTY_SWITCH_DEFAULT_CASE();
}
}
Expand Down Expand Up @@ -595,6 +597,8 @@ static bool dom_remove_attribute(xmlNodePtr thisp, xmlNodePtr attrp)

break;
}
case XML_ATTRIBUTE_DECL:
return false;
EMPTY_SWITCH_DEFAULT_CASE();
}
return true;
Expand Down Expand Up @@ -726,7 +730,11 @@ static void dom_element_set_attribute_node_common(INTERNAL_FUNCTION_PARAMETERS,
existattrp = xmlHasProp(nodep, attrp->name);
}

if (existattrp != NULL && existattrp->type != XML_ATTRIBUTE_DECL) {
if (existattrp != NULL && existattrp->type == XML_ATTRIBUTE_DECL) {
existattrp = NULL;
}

if (existattrp != NULL) {
if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) != NULL &&
((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr) attrp)
{
Expand Down Expand Up @@ -1788,8 +1796,7 @@ PHP_METHOD(DOMElement, toggleAttribute)

/* Step 5 */
if (force_is_null || !force) {
dom_remove_attribute(thisp, attribute);
retval = false;
retval = !dom_remove_attribute(thisp, attribute);
goto out;
}

Expand Down
98 changes: 98 additions & 0 deletions ext/dom/tests/gh22825.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
--TEST--
GH-22825 (DOMElement::setAttribute() reaches EMPTY_SWITCH_DEFAULT_CASE() with DTD #FIXED default attributes)
--EXTENSIONS--
dom
--FILE--
<?php
$cases = [
['<!ATTLIST root A CDATA #FIXED "d">', '<root/>', 'A'],
['<!ATTLIST root A CDATA "d">', '<root/>', 'A'],
['<!ATTLIST root p:A CDATA #FIXED "d">', '<root xmlns:p="urn:p"/>', 'p:A'],
];

function element(string $attlist, string $root): DOMElement {
$doc = new DOMDocument();
$doc->loadXML("<!DOCTYPE root [$attlist]>$root");
return $doc->documentElement;
}

foreach ($cases as [$attlist, $root, $name]) {
echo "--- $attlist ---\n";

$el = element($attlist, $root);
echo "hasAttribute: ";
var_dump($el->hasAttribute($name));
echo "getAttribute: ";
var_dump($el->getAttribute($name));

$el = element($attlist, $root);
$result = $el->setAttribute($name, 'v');
echo "setAttribute: ", is_object($result) ? $result::class : var_export($result, true), "\n";
echo "after setAttribute: ", trim($el->ownerDocument->saveXML($el)), "\n";

$el = element($attlist, $root);
echo "removeAttribute: ";
var_dump($el->removeAttribute($name));
echo "still present after removeAttribute: ";
var_dump($el->hasAttribute($name));

$el = element($attlist, $root);
echo "toggleAttribute(false): ";
var_dump($el->toggleAttribute($name, false));
echo "still present after toggleAttribute(false): ";
var_dump($el->hasAttribute($name));

$el = element($attlist, $root);
echo "toggleAttribute(true): ";
var_dump($el->toggleAttribute($name, true));
echo "still present after toggleAttribute(true): ";
var_dump($el->hasAttribute($name));

$el = element($attlist, $root);
$attr = $el->ownerDocument->createAttribute($name);
$attr->value = 'z';
echo "setAttributeNode: ";
var_dump($el->setAttributeNode($attr));
echo "after setAttributeNode: ", trim($el->ownerDocument->saveXML($el)), "\n";
}
?>
--EXPECT--
--- <!ATTLIST root A CDATA #FIXED "d"> ---
hasAttribute: bool(true)
getAttribute: string(1) "d"
setAttribute: DOMAttr
after setAttribute: <root A="v"/>
removeAttribute: bool(false)
still present after removeAttribute: bool(true)
toggleAttribute(false): bool(true)
still present after toggleAttribute(false): bool(true)
toggleAttribute(true): bool(true)
still present after toggleAttribute(true): bool(true)
setAttributeNode: NULL
after setAttributeNode: <root A="z"/>
--- <!ATTLIST root A CDATA "d"> ---
hasAttribute: bool(true)
getAttribute: string(1) "d"
setAttribute: DOMAttr
after setAttribute: <root A="v"/>
removeAttribute: bool(false)
still present after removeAttribute: bool(true)
toggleAttribute(false): bool(true)
still present after toggleAttribute(false): bool(true)
toggleAttribute(true): bool(true)
still present after toggleAttribute(true): bool(true)
setAttributeNode: NULL
after setAttributeNode: <root A="z"/>
--- <!ATTLIST root p:A CDATA #FIXED "d"> ---
hasAttribute: bool(true)
getAttribute: string(1) "d"
setAttribute: DOMAttr
after setAttribute: <root xmlns:p="urn:p" p:A="v"/>
removeAttribute: bool(false)
still present after removeAttribute: bool(true)
toggleAttribute(false): bool(true)
still present after toggleAttribute(false): bool(true)
toggleAttribute(true): bool(true)
still present after toggleAttribute(true): bool(true)
setAttributeNode: NULL
after setAttributeNode: <root xmlns:p="urn:p" p:A="z"/>
Loading