From 8b7d510fb182ca40bd0f905bb2f5543b0d9549de Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 28 May 2005 12:22:38 -0700 Subject: [PATCH] [PATCH] Fix count-delta overcounting The count-delta routine sometimes overcounted the copied source material which resulted in unsigned int wraparound. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- count-delta.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/count-delta.c b/count-delta.c index 3bcc205f51..e10c832a75 100644 --- a/count-delta.c +++ b/count-delta.c @@ -88,5 +88,8 @@ unsigned long count_delta(void *delta_buf, unsigned long delta_size) /* delete size is what was _not_ copied from source. * edit size is that and literal additions. */ + if (src_size + added_literal < copied_from_source) + /* we ended up overcounting and underflowed */ + return 0; return (src_size - copied_from_source) + added_literal; } -- 2.11.4.GIT