Fix GH-14652: segfault on node without document. #14653
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devnexen
force-pushed
the
gh14652
branch
3 times, most recently
from
ab7278b
to
e5a5e41
Compare
nielsdos
requested changes
Jun 24, 2024
ext/dom/php_dom.c
Outdated
| @@ -584,7 +584,7 @@ static zend_object *dom_objects_store_clone_obj(zend_object *zobject) /* {{{ */ | |||
|
|
|||
| if (instanceof_function(intern->std.ce, dom_node_class_entry) || instanceof_function(intern->std.ce, dom_modern_node_class_entry)) { | |||
| xmlNodePtr node = (xmlNodePtr)dom_object_get_node(intern); | |||
| if (node != NULL) { | |||
| if (node != NULL && node->doc) { | |||
There was a problem hiding this comment.
The patch isn't right unfortunately.
This will break the following code: https://3v4l.org/dq0ct
This could've been revealed if your test was more elaborate, when dealing with things like this I recommend also dumping some state of the objects to see if this has consequences.
The right way to fix this is by adding a null check (ns_mapper != NULL) around the assignment of clone->document->private_data. The reason being that:
clone->documentwill be NULL for documentless nodes, and for old DOM setting this is pointless anyway- only new DOM uses the ns_mapper, and it will always have an internal document reference set (the fact that your
->documentor->docpointer can be NULL in old DOM is imo a design mistake that I got rid of in new DOM).
ext/dom/tests/gh14652.phpt
Outdated
| } | ||
| } | ||
| $clone = clone $script1_dataflow; | ||
| echo "OK"; |
There was a problem hiding this comment.
Please make sure to close tests with ?> so that phpt files can be run directly.
nielsdos
changed the title
|
I think it'd be good to just copy the test code from the 3v4l link, as that code is cleaner + tests the object state. |
do not bother trying to clone the inner document if there is none to begin with.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
do not bother trying to clone the inner document if there is none to begin with.