kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <gitster@pobox.com>
maint
Jeff King 2007-12-16 02:06:14 -05:00 committed by Junio C Hamano
parent 7680087e7c
commit 5249997735
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xdiff-interface.c
View File

@ -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) static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx)
{ {
const int blk = 1024; const int blk = 1024;
long trimmed = 0, recovered = 0, i; long trimmed = 0, recovered = 0;
char *ap = a->ptr + a->size; char *ap = a->ptr + a->size;
char *bp = b->ptr + b->size; char *bp = b->ptr + b->size;
long smaller = (a->size < b->size) ? a->size : 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; bp -= blk;
} }


for (i = 0, recovered = 0; recovered < trimmed && i <= ctx; i++) { while (recovered < trimmed && ctx)
while (recovered < trimmed && ap[recovered] != '\n') if (ap[recovered++] == '\n')
recovered++; ctx--;
}
a->size -= (trimmed - recovered); a->size -= (trimmed - recovered);
b->size -= (trimmed - recovered); b->size -= (trimmed - recovered);
} }