From: Martin Koegler <martin.koegler@chello.at>
Date: Thu, 10 Aug 2017 18:13:09 +0000 (+0200)
Subject: diff-delta: do not allow delta offset truncation
X-Git-Tag: v2.15.0-rc0~39^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fed1ef9550d528dffa8891e8b2f49b486c7985bc;p=thirdparty%2Fgit.git

diff-delta: do not allow delta offset truncation

Prevent generating delta offsets beyond 4G, as the xdelta used in
the pack format cannot represent such large offset.

Signed-off-by: Martin Koegler <martin.koegler@chello.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/diff-delta.c b/diff-delta.c
index 3797ce6041..ea710c44ce 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -452,6 +452,9 @@ create_delta(const struct delta_index *index,
 			moff += msize;
 			msize = left;
 
+			if (moff > 0xffffffff)
+				msize = 0;
+
 			if (msize < 4096) {
 				int j;
 				val = 0;