Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 9f4bdd3296d19b75211ca0f2434d227eafac44b6..47ed610677fe47f855beaac02f40fa84d132455e 100644 (file)
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -370,6 +370,8 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
                        base_offset = (base_offset << 7) + (c & 127);
                }
                base_offset = obj_list[nr].offset - base_offset;
+               if (base_offset <= 0 || base_offset >= obj_list[nr].offset)
+                       die("offset value out of bound for delta base object");
 
                delta_data = get_data(delta_size);
                if (dry_run || !delta_data) {