Fix GH-17847: xinclude destroys live node #17878
Closed
Conversation
This file contains hidden or 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
dom_xinclude_strip_fallback_references() now also takes into account xi:include nodes children. This now subsumes all work done normally by the old start/end node removal, so we can remove that code and start using XML_PARSE_NOXINCNODE.
Girgias
reviewed
Feb 21, 2025
ext/dom/document.c
Outdated
| * and remove the original nodes. If the originals are removed while there are still userland references | ||
| * this will cause memory corruption. */ | ||
| static void dom_xinclude_strip_fallback_references(const xmlNode *basep) | ||
| static void dom_xinclude_strip_fallback_references(xmlDocPtr docp, const xmlNode *basep) |
There was a problem hiding this comment.
Why is the docPtr necessary here?
There was a problem hiding this comment.
Leftover from when I was playing around with this. Dropped.
Girgias
approved these changes
Feb 21, 2025
|
Also for future reference: the existing code to remove the xinclude start/end nodes wasn't right anyway as it only looked at the top level AFAICT |
|
Ah great, CI is red on some instances because libxml error messages are not consistent between versions :( |
|
Win CI is unrelated. |
charmitro
pushed a commit
to wasix-org/php
that referenced
this pull request
Mar 13, 2025
dom_xinclude_strip_fallback_references() now also takes into account xi:include nodes children. This now subsumes all work done normally by the old start/end node removal, so we can remove that code and start using XML_PARSE_NOXINCNODE. Closes phpGH-17878.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
dom_xinclude_strip_fallback_references() now also takes into account xi:include nodes children. This now subsumes all work done normally by the old start/end node removal, so we can remove that code and start using XML_PARSE_NOXINCNODE.