Repository navigation
Conversation
Member
|
It breaks on 8.4 too though. Was targeting 8.5 only deliberate? |
Member
Author
|
oh ... 8.4 is more involved I would need to backport more. updating... |
Co-authored-by: David CARLIER <devnexen@gmail.com> close phpGH-22078 (cherry picked from commit 33a49bb)
…ument node. Fix phpGH-22554 A PHP XPath callback that returns a node belonging to a document created inside the callback (e.g. $d->documentElement of a throwaway DOMDocument) parks that node in the DOMXPath node_list to keep it alive. When a sibling callback consumes a node navigated into that foreign document, the proxy object was created with the DOMXPath's own dom as parent, so it took a reference on the wrong document and none on the foreign one. On teardown the foreign document could be freed while the proxy still referenced it. Route the proxy factory through dom_xpath_intern_for_doc() so the created object shares the ref_obj of the node's actual document, mirroring the query-result path. close phpGH-22562 (cherry picked from commit f36660d)
dom_xpath_intern_for_doc walked xpath_callbacks.node_list with Z_DOMOBJ_P on every entry. That list also stores arrays (nodeset-mode callback arguments). Same-document results take the early return; a later php:function that returns a node from another document walks the leftover array first. Skip non-objects and recurse into arrays so the matching intern is found instead of type-confusing the array. Closes phpGH-23253 (cherry picked from commit fcdc4fb)
Member
|
Doesn't the namespace axis have the same problem? (i.e. |
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
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.
…ument node.
Fix GH-22554
A PHP XPath callback that returns a node belonging to a document created inside the callback (e.g. $d->documentElement of a throwaway DOMDocument) parks that node in the DOMXPath node_list to keep it alive. When a sibling callback consumes a node navigated into that foreign document, the proxy object was created with the DOMXPath's own dom as parent, so it took a reference on the wrong document and none on the foreign one. On teardown the foreign document could be freed while the proxy still referenced it.
Route the proxy factory through dom_xpath_intern_for_doc() so the created object shares the ref_obj of the node's actual document, mirroring the query-result path.
close GH-22562
(cherry picked from commit f36660d)