Repository navigation
Conversation
This branch has not been deployed
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.
Fixes #101.
ChunkHeader._load_stringsand._load_templatesfollow each hash-bucket's on-disknext_offsetchain with no protection against an offset that repeats. Sincenext_offsetis read straight from the file, a crafted chunk with a cyclic chain (A.next_offset -> B,B.next_offset -> A) makes thewhile ofs > 0:loop run forever, so parsing an untrusted.evtxhangs the process (CWE-835).This change records the offsets already visited while walking a bucket and breaks out of the loop when one repeats. Well-formed files follow a strictly terminating chain, so their behaviour is unchanged; the strings/templates dict is still keyed by offset exactly as before.
Test
tests/test_cyclic_offsets.pybuilds a single chunk whose string (and template) bucket points at a two-node cycle and asserts the loader terminates. The traversal runs in a short-lived daemon thread, so an unfixed loop surfaces as a failed assertion instead of wedging the whole suite.Verified:
pytestis green — 24 passed, including the 2 new tests;black,isortandruff(line-length 120) are clean on the changed files.