From 007ebc477a9cb14704cf628859e9de747c268d5b Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Wed, 14 Feb 2018 18:14:15 +0100 Subject: fix crash when generating a unified diff with a small ending equal-chunk Signed-off-by: Mechiel Lukkien --- plumbing/format/diff/unified_encoder.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'plumbing/format') diff --git a/plumbing/format/diff/unified_encoder.go b/plumbing/format/diff/unified_encoder.go index cf2a34b..58edd95 100644 --- a/plumbing/format/diff/unified_encoder.go +++ b/plumbing/format/diff/unified_encoder.go @@ -262,11 +262,15 @@ func (c *hunksGenerator) processEqualsLines(ls []string, i int) { c.current.AddOp(Equal, c.afterContext...) c.afterContext = nil } else { - c.current.AddOp(Equal, c.afterContext[:c.ctxLines]...) + ctxLines := c.ctxLines + if ctxLines > len(c.afterContext) { + ctxLines = len(c.afterContext) + } + c.current.AddOp(Equal, c.afterContext[:ctxLines]...) c.hunks = append(c.hunks, c.current) c.current = nil - c.beforeContext = c.afterContext[c.ctxLines:] + c.beforeContext = c.afterContext[ctxLines:] c.afterContext = nil } } -- cgit From 9720a5ff740a5934915c16d306ceff9e6470889e Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Fri, 16 Feb 2018 14:44:30 +0100 Subject: add test for crashing diff this reuses an existing patch, setting context to 6 triggers the bug, becuase of a 5-line trailing equals chunk. Signed-off-by: Mechiel Lukkien --- plumbing/format/diff/unified_encoder_test.go | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'plumbing/format') diff --git a/plumbing/format/diff/unified_encoder_test.go b/plumbing/format/diff/unified_encoder_test.go index 6e12070..0e419ca 100644 --- a/plumbing/format/diff/unified_encoder_test.go +++ b/plumbing/format/diff/unified_encoder_test.go @@ -475,6 +475,43 @@ index ab5eed5d4a2c33aeef67e0188ee79bed666bde6f..0adddcde4fd38042c354518351820eb0 V W `, +}, { + patch: oneChunkPatch, + desc: "modified deleting lines file with context to 6", + context: 6, + diff: `diff --git a/onechunk.txt b/onechunk.txt +index ab5eed5d4a2c33aeef67e0188ee79bed666bde6f..0adddcde4fd38042c354518351820eb06c417c82 100644 +--- a/onechunk.txt ++++ b/onechunk.txt +@@ -1,27 +1,23 @@ +-A + B + C + D + E + F + G +-H + I + J + K + L + M + N +-Ñ + O + P + Q + R + S + T +-U + V + W + X + Y + Z +`, }, { patch: oneChunkPatch, -- cgit