Skip to content

Stop parsing on invalid or trailing data #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabian-z wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stop parsing on invalid or trailing data #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/yaffshiv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,9 @@ class YAFFSParser(YAFFS):
obj_hdr = YAFFSSpare(obj_hdr_spare, self.config)
except YAFFSException as e:
self.dbg_write("YAFFSException: {}\n".format(e))
continue
# Could not parse block as data or spare entry
# assume invalid or trailing data
break
self.dbg_write("GOT OBJECT: {}\n".format(obj_hdr))
obj_hdr.data_offset = current_offset
self.scanned_data.append(obj_hdr)
Expand Down Expand Up @@ -942,10 +944,12 @@ def main():
# Try auto-detected / manual / default settings first.
# If those work without errors, then assume they are correct.
fs = YAFFSExtractor(data, config)
# If there were errors in parse_yaffs, and brute forcing is enabled, loop
# through all possible configuration combinations looking for the one
# combination that produces the most successfully parsed object entries.
if not parse_yaffs(fs) and brute_force:
parse_yaffs(fs)

# If there brute forcing is enabled, loop through all possible configuration
# combinations looking for the one combination that produces the most successfully
# parsed object entries. Parsing may return 0 entries even for invalid settings.
if brute_force:
for endianess in [YAFFS.LITTLE_ENDIAN, YAFFS.BIG_ENDIAN]:
for ecclayout in [True, False]:
for page_size in YAFFS.PAGE_SIZES:
Expand Down