gh-146056: Fix TreeBuilder stack in xml.etree#146062
Open
vstinner wants to merge 1 commit intopython:mainfrom
Open
gh-146056: Fix TreeBuilder stack in xml.etree#146062vstinner wants to merge 1 commit intopython:mainfrom
vstinner wants to merge 1 commit intopython:mainfrom
Conversation
No longer create a stack of 20 items, but create an empty stack instead. It prevents crashes when the stack list is discovered by gc.get_referrers() or other functions. Fix also reference counting in treebuilder_handle_end().
Member
Author
|
I added "skip news" since this issue requires calling |
| item = self->last; | ||
| self->last = Py_NewRef(self->this); | ||
| Py_XSETREF(self->last_for_tail, self->last); | ||
| Py_XSETREF(self->last_for_tail, Py_NewRef(self->last)); |
Member
There was a problem hiding this comment.
This is unrelated.
If rewrite this code to be more explicit or safe, I would write something like
PyObject *last = self->last;
PyObject *last_for_tail = self->last_for_tail;
PyObject *this = self->this;
self->index--;
self->this = Py_NewRef(PyList_GET_ITEM(self->stack, self->index));
self->last = Py_NewRef(this);
self->last_for_tail = Py_NewRef(this);
Py_DECREF(last);
Py_XDECREF(last_for_tail);
if (treebuilder_append_event(self, self->end_event_obj, this) < 0) {
Py_DECREF(this);
return NULL;
}
return this;But we should also look a the other ends -- how these attributes are set in other code in this file. This is a separate issue.
| t->comment_factory = NULL; | ||
| t->pi_factory = NULL; | ||
| t->stack = PyList_New(20); | ||
| t->stack = PyList_New(0); |
Member
There was a problem hiding this comment.
This can have performance impact.
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
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.
No longer create a stack of 20 items, but create an empty stack instead. It prevents crashes when the stack list is discovered by gc.get_referrers() or other functions.
Fix also reference counting in treebuilder_handle_end().
xml.etree.ElementTree.TreeBuilder#146056