wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

patchutils.py: Fix a bug when parsing certain hunk headers.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-07-22 18:44:44 +02:00
parent 4b1b7f77bc
commit 2b1f2e8578
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/patchutils.py
View File

@ -141,11 +141,12 @@ class _PatchReader(object):
if line is None or not line.startswith("@@ -"):
return None
r = re.match("^@@ -(([0-9]+),)?([0-9]+) \+(([0-9]+),)?([0-9]+) @@", line)
r = re.match("^@@ -([0-9]+)(,([0-9]+))? \+([0-9]+)(,([0-9]+))? @@", line)
if not r: raise PatchParserError("Unable to parse hunk header '%s'." % line)
srcpos = max(int(r.group(2)) - 1, 0) if r.group(2) else 0
dstpos = max(int(r.group(5)) - 1, 0) if r.group(5) else 0
srclines, dstlines = int(r.group(3)), int(r.group(6))
srcpos = max(int(r.group(1)) - 1, 0)
dstpos = max(int(r.group(4)) - 1, 0)
srclines = int(r.group(3)) if r.group(3) else 1
dstlines = int(r.group(6)) if r.group(6) else 1
if srclines <= 0 and dstlines <= 0:
raise PatchParserError("Empty hunk doesn't make sense.")
self.read()