]> git.neil.brown.name Git - wiggle.git/commit
git / wiggle.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 00c699a) | patch
merge2: guard against over-flowing elcnt
authorNeilBrown <neil@brown.name>
Fri, 27 Dec 2019 04:58:27 +0000 (15:58 +1100)
committerNeilBrown <neil@brown.name>
Fri, 27 Dec 2019 04:58:27 +0000 (15:58 +1100)
commit2039d8f832c8cf2604d6c569a320d0148eae14e0
treed1c5cf8f6e1c4ad1ef14980cd2052bd842e751fatree | snapshot
parent00c699ae751519a0fc8f25fb99cb0554e5b3f617commit | diff
merge2: guard against over-flowing elcnt

It should be impossible to overflow elcnt in these
cases, but I have seen it happen.
There must be bug somewhere else, but for now, just prevent the
crash.

Signed-off-by: NeilBrown <neil@brown.name>
merge2.c diff | blob | history
apply rejected patches and perform word-wise diffs