Commit Briefs

f1dbec24f9 Stefan Sperling

fix a size_t multiplication overflow in diff_meyrs.c

Found on an OpenBSD armv7 machine running Got regression tests: test_status_shows_no_mods_after_complete_merge Segmentation fault (core dumped) The problematic multiplication is kd_len * kd_len in diff_algo_myers() with kd_len set to 65537. (gdb) p (int)(65537 * 65537) $64 = 131073 (gdb) p (int)(65537 + 65537) $65 = 131074 (gdb) p (unsigned int)(size_t)(-1) $68 = 4294967295 (gdb) p (4294967295 / kd_len) $71 = 65535 Detect such overflow and run the fallback diff algorithm instead.

diff | patch | tree

60c6aae16f Stefan Sperling

set a minimum myers effort limit to avoid an early short-cut on small files

discussed with Neels

diff | patch | tree

fe6d58fb52 Christian Weisgerber

add a missing include for uint8_t and switch from <inttypes.h> to <stdint.h>

ok millert stsp

diff | patch | tree

7280e29c8e Neels Hofmeyr

remove a bunch of overly verbose debug

diff | patch | tree

8be88dfa93 Stefan Sperling

cache kd_buf in struct diff_state to avoid repeated allocation + free

diff | patch | tree

926387ed74 Neels Hofmeyr

fix myers_divide max-effort cut, wrong x for backwards coordinate

diff | patch | tree

f579bf7733 Neels Hofmeyr

debug output fixes

- fix compilation error with DEBUG 1, after moving patience state out of diff_atom, and after renaming diff_data.d to diff_data.root. - add some missing newlines. - also debug "HIT" on a max-effort cut, like when finding a mid snake, which eases finding all the places where boxes get cut.

diff | patch | tree

70fb5a4714 Neels Hofmeyr

diff_myers: fix some uninitialized warnings

diff | patch | tree

984ca65b1b Neels Hofmeyr

myers_divide: fix "inifite" looping over same box

diff | patch | tree

19fad31f2f Neels Hofmeyr

debug: diff_myers.c: #if DEBUG, not if (DEBUG)

diff | patch | tree

359b29cbe1 Neels Hofmeyr

debug: fix "state size:" printing buf size

diff | patch | tree

c254f08cfd Neels Hofmeyr

drop dangerous debug statement

diff | patch | tree

1dfba0555e Stefan Sperling

move headers from include/diff/ to include/; makes things easier for consumers

diff | patch | tree

2a1b94d029 Stefan Sperling

repair DEBUG build

diff | patch | tree

85ab455967 Stefan Sperling

move some definitions from the public diff_main.h to an internal header file

diff | patch | tree

7a54ad3ae5 Stefan Sperling

use buffered stdio if falling back on file i/o; this is much faster

diff | patch | tree

e4464189bc Stefan Sperling

rename 'debug.h' to 'diff_debug.h'

diff | patch | tree

cd25827e24 Neels Hofmeyr

myers_divide: stop traversing snakes after reasonable max effort

diff | patch | tree

ac2eeeffef Neels Hofmeyr

myers: error handling from diff_atoms_same()

diff | patch | tree

b3fb46867c Neels Hofmeyr

add diff_atom_cmp() and error handling to diff_atom_same()

diff | patch | tree

e10a628aa1 Stefan Sperling

avoid include statements in header files; make each .c pull in what's needed

diff | patch | tree

3e6cba3a54 Stefan Sperling

replace enum diff_rc errors with plain errno values

diff | patch | tree

0d27172a82 Neels Hofmeyr

KNF: use max 80 columns

diff | patch | tree

61a7b57805 Neels Hofmeyr

KNF: function declaration return types on separate line

diff | patch | tree

a45330b152 Neels Hofmeyr

fix myers divide: properly trigger division on single midpoints

diff | patch | tree