gh-148731: Fix Element.iter() crash on OOM#148838
Open
gz83 wants to merge 1 commit intopython:mainfrom
Open
Conversation
|
All commit authors signed the Contributor License Agreement. |
Initialize ElementIterObject fields before allocating parent_stack so the partially initialized iterator can be safely deallocated if PyMem_New() fails. Add a regression test covering the MemoryError path in Element.iter().
Author
|
Hello, please take a look at this patch. Also, this is my first time contributing a patch to cpython, so please point out any shortcomings. Thank you! |
| class MiscTests(unittest.TestCase): | ||
| @classmethod | ||
| def setUpClass(cls): | ||
| cls.testcapi = import_module('_testcapi') |
Member
There was a problem hiding this comment.
If it is not available the entire MiscTests will be skipped?
| raised = True | ||
| finally: | ||
| self.testcapi.remove_mem_hooks() | ||
| self.assertTrue(raised, "MemoryError not raised") |
Member
There was a problem hiding this comment.
You can use:
with self.assertRaises(MemoryError):inside the try instead.
| it->parent_stack_used = 0; | ||
| it->parent_stack_size = 0; | ||
| it->root_element = NULL; | ||
| it->sought_tag = NULL; |
Member
There was a problem hiding this comment.
These are initialised shortly after anyway?
Comment on lines
2379
to
2380
| it->parent_stack_used = 0; | ||
| it->parent_stack_size = INIT_PARENT_STACK_SIZE; |
Member
There was a problem hiding this comment.
Perhaps simply moving these two lines up can fix the issue.
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
3 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.
Initialize ElementIterObject fields before allocating parent_stack so the partially initialized iterator can be safely deallocated if PyMem_New() fails.
Add a regression test covering the MemoryError path in Element.iter().
Tests run:
./python -m test test_xml_etree_ccreate_elementiterwhen OOM #148731