view tests/test-merge8.out @ 4358:11dc22eb8e8d

Fix segfaults when parsing bdiff hunks in mpatch.decode() and .patchedsize()

- fix off by 11 when checking if there are more hunks (found by Maris Fogels)
- bail out if start is greater than end
- check if new hunk starts after start/end/len block of current hunk as
  the pointer can wrap around on very large values, reproducible with
  import mpatch; mpatch.patchedsize(12, 'x'*12)

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved