From 52499977350b95ba7166e5c835b09cdbc20a3d02 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 16 Dec 2007 02:06:14 -0500 Subject: [PATCH] trim_common_tail: brown paper bag fix. The recovered context lines were not LF terminated due to off-by-one error, which also caused the outer loop to count the number of recovered lines to terminate after running only once. Signed-off-by: Junio C Hamano --- xdiff-interface.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xdiff-interface.c b/xdiff-interface.c index 700def211e..98b02eda35 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -110,7 +110,7 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf) static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) { const int blk = 1024; - long trimmed = 0, recovered = 0, i; + long trimmed = 0, recovered = 0; char *ap = a->ptr + a->size; char *bp = b->ptr + b->size; long smaller = (a->size < b->size) ? a->size : b->size; @@ -121,10 +121,9 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) bp -= blk; } - for (i = 0, recovered = 0; recovered < trimmed && i <= ctx; i++) { - while (recovered < trimmed && ap[recovered] != '\n') - recovered++; - } + while (recovered < trimmed && ctx) + if (ap[recovered++] == '\n') + ctx--; a->size -= (trimmed - recovered); b->size -= (trimmed - recovered); }