Skip to content

Commit fdbe2ac

Browse files
committed
Merge branch 'mk/diff-delta-avoid-large-offset'
The delta format used in the packfile cannot reference data at offset larger than what can be expressed in 4-byte, but the generator for the data failed to make sure the offset does not overflow. This has been corrected. * mk/diff-delta-avoid-large-offset: diff-delta: do not allow delta offset truncation
2 parents 3d09e79 + fed1ef9 commit fdbe2ac

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

diff-delta.c

+3
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,9 @@ create_delta(const struct delta_index *index,
454454
moff += msize;
455455
msize = left;
456456

457+
if (moff > 0xffffffff)
458+
msize = 0;
459+
457460
if (msize < 4096) {
458461
int j;
459462
val = 0;

0 commit comments

Comments
 (0)