Skip to content

Guard git status parser against infinite loop on unknown entry #124

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
grub-basket wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Guard git status parser against infinite loop on unknown entry #124

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
16 changes: 11 additions & 5 deletions gitfourchette/gitdriver/parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,19 @@ def parseGitStatus(stdout: str, workdir: str):

while pos < limit:
ident = stdout[pos]
try:
pattern = _gitStatusPatterns[ident]
except KeyError:
logging.warning(f"unknown git status ident '{ident}'")
pattern = _gitStatusPatterns.get(ident)
match = pattern.match(stdout, pos) if pattern is not None else None

if match is None:
# Unknown ident or malformed record. Skip to the next NUL-terminated
# entry rather than re-reading the same character forever.
logging.warning(f"skipping unparseable git status entry (ident '{ident}')")
nul = stdout.find("\x00", pos)
if nul < 0:
break
pos = nul + 1
continue

match = pattern.match(stdout, pos)
pos = match.end()

staged, unstaged = _parseStatusLine(ident, *match.groups())
Expand Down