Got Mirror

Commits

Commit:: f1dbec24f9a9553e22659f6c592c91e96221f6b9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Nov 23 19:11:53 2021 UTC

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

Commit:: 60c6aae16f7ac9b67326d34fca6de68561e97c0e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Nov 22 00:18:23 2020 UTC

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

diff | patch | tree

Commit:: fe6d58fb52ea8d1041a8eb65e28a04816df67c08
From:: Christian Weisgerber <naddy@mips.inka.de>
Date:: Sat Nov 14 16:35:29 2020 UTC

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

diff | patch | tree

Commit:: 7280e29c8ed198cf9253d84bb9289e55adaabf12
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Fri Oct 30 13:40:41 2020 UTC

remove a bunch of overly verbose debug

diff | patch | tree

Commit:: 8be88dfa934d602d1cf29ba3e33162511f08b748
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Oct 21 21:57:37 2020 UTC

cache kd_buf in struct diff_state to avoid repeated allocation + free

diff | patch | tree

Commit:: 926387ed74169349bdfa40445192f2b23d815244
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Tue Oct 20 00:16:03 2020 UTC

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

diff | patch | tree

Commit:: f579bf773398809ee97341a20c91eadd918bc1ad
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Tue Oct 20 00:12:45 2020 UTC

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

Commit:: 70fb5a47142d240e33700b734a57433248225624
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Thu Oct 15 13:55:38 2020 UTC

diff_myers: fix some uninitialized warnings

diff | patch | tree

Commit:: 984ca65b1b715a9fdc86bfff64e90a485d008058
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Oct 11 05:31:05 2020 UTC

myers_divide: fix "inifite" looping over same box

diff | patch | tree

Commit:: 19fad31f2f7cceb234a814c262dbba796b36af97
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Oct 11 05:31:05 2020 UTC

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

diff | patch | tree

Commit:: 359b29cbe1fd2b48f3974ac65bf33933bd603715
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Oct 11 03:49:05 2020 UTC

debug: fix "state size:" printing buf size

diff | patch | tree

Commit:: c254f08cfde4575dac4fdda0bea1175ab6171608
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Oct 11 03:49:05 2020 UTC

drop dangerous debug statement

diff | patch | tree

Commit:: 1dfba0555efd6b616811906d011f96945be90dcc
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Oct 7 14:05:26 2020 UTC

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

diff | patch | tree

Commit:: 2a1b94d029d73b14949971a9f159da4670584ee9
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sat Sep 26 19:34:11 2020 UTC

repair DEBUG build

diff | patch | tree

Commit:: 85ab45596727cfd0254c6d5b6f0c5705b7b6e89e
From:: Stefan Sperling <stsp@stsp.name>
Date:: Tue Sep 22 09:47:05 2020 UTC

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

diff | patch | tree

Commit:: 7a54ad3ae5d25aa5349668c8d3d3fa048a8f0733
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Sep 20 23:04:57 2020 UTC

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

diff | patch | tree

Commit:: e4464189bc895121565a7a02eef98262343e6e24
From:: Stefan Sperling <stsp@stsp.name>
Date:: Sun Sep 20 20:40:48 2020 UTC

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

diff | patch | tree

Commit:: cd25827e24b8fad0a3f4a89b72fbdba86bc2c5d1
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Sep 20 14:15:51 2020 UTC

myers_divide: stop traversing snakes after reasonable max effort

diff | patch | tree

Commit:: ac2eeeffef0b2071f39513685c4b6d594a30416d
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Sep 20 14:13:07 2020 UTC

myers: error handling from diff_atoms_same()

diff | patch | tree

Commit:: b3fb46867c2efc085c584bd336b9dca9cf26a161
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Sun Sep 20 14:13:07 2020 UTC

add diff_atom_cmp() and error handling to diff_atom_same()

diff | patch | tree

Commit:: e10a628aa1d46df600ffc7194d35f67416eaefdd
From:: Stefan Sperling <stsp@stsp.name>
Date:: Wed Sep 16 12:42:09 2020 UTC

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

diff | patch | tree

Commit:: 3e6cba3a54789e151b37851eef9cdccc4180ae40
From:: Stefan Sperling <stsp@stsp.name>
Date:: Thu Aug 13 14:31:38 2020 UTC

replace enum diff_rc errors with plain errno values

diff | patch | tree

Commit:: 0d27172a828e5ff3c6457cbf0d36a88c9bd8e370
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Wed May 6 22:04:06 2020 UTC

KNF: use max 80 columns

diff | patch | tree

Commit:: 61a7b57805472a03ad39d7bf4ef6d705eb0ccac2
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Wed May 6 22:03:59 2020 UTC

KNF: function declaration return types on separate line

diff | patch | tree

Commit:: a45330b1527e02e1627af02b55831f4cdf8794b4
From:: Neels Hofmeyr <neels@hofmeyr.de>
Date:: Tue May 5 05:04:21 2020 UTC

fix myers divide: properly trigger division on single midpoints

diff | patch | tree