make check_object() resilient to pack corruptions

The check_object() function tries to get away with the least amount of
pack access possible when it already has partial information on given
object rather than calling the more costly packed_object_info().

When things don't look right, it should just give up and fall back to
packed_object_info() directly instead of die()'ing.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 64aefdf23b9f66e81b8cd241a75ad5002443f96b..c05fb944b0e5d4d26cb2ba1995a787f08d5228ad 100644 (file)
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1005,6 +1005,8 @@ static void check_object(struct object_entry *entry)
                used = unpack_object_header_buffer(buf, avail,
                                                   &entry->in_pack_type,
                                                   &entry->size);
                used = unpack_object_header_buffer(buf, avail,
                                                   &entry->in_pack_type,
                                                   &entry->size);

+               if (used == 0)
+                       goto give_up;

 
                /*
                 * Determine if this is a delta and if so whether we can
 
                /*
                 * Determine if this is a delta and if so whether we can


@@ -1016,6 +1018,8 @@ static void check_object(struct object_entry *entry)
                        /* Not a delta hence we've already got all we need. */
                        entry->type = entry->in_pack_type;
                        entry->in_pack_header_size = used;
                        /* Not a delta hence we've already got all we need. */
                        entry->type = entry->in_pack_type;
                        entry->in_pack_header_size = used;

+                       if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
+                               goto give_up;

                        unuse_pack(&w_curs);
                        return;
                case OBJ_REF_DELTA:
                        unuse_pack(&w_curs);
                        return;
                case OBJ_REF_DELTA:


@@ -1032,16 +1036,20 @@ static void check_object(struct object_entry *entry)
                        ofs = c & 127;
                        while (c & 128) {
                                ofs += 1;
                        ofs = c & 127;
                        while (c & 128) {
                                ofs += 1;

-                               if (!ofs || MSB(ofs, 7))
-                                       die("delta base offset overflow in pack for %s",
-                                           sha1_to_hex(entry->idx.sha1));
+                               if (!ofs || MSB(ofs, 7)) {
+                                       error("delta base offset overflow in pack for %s",
+                                             sha1_to_hex(entry->idx.sha1));
+                                       goto give_up;
+                               }

                                c = buf[used_0++];
                                ofs = (ofs << 7) + (c & 127);
                        }
                        ofs = entry->in_pack_offset - ofs;
                                c = buf[used_0++];
                                ofs = (ofs << 7) + (c & 127);
                        }
                        ofs = entry->in_pack_offset - ofs;

-                       if (ofs <= 0 || ofs >= entry->in_pack_offset)
-                               die("delta base offset out of bound for %s",
-                                   sha1_to_hex(entry->idx.sha1));
+                       if (ofs <= 0 || ofs >= entry->in_pack_offset) {
+                               error("delta base offset out of bound for %s",
+                                     sha1_to_hex(entry->idx.sha1));
+                               goto give_up;
+                       }

                        if (reuse_delta && !entry->preferred_base) {
                                struct revindex_entry *revidx;
                                revidx = find_pack_revindex(p, ofs);
                        if (reuse_delta && !entry->preferred_base) {
                                struct revindex_entry *revidx;
                                revidx = find_pack_revindex(p, ofs);


@@ -1078,6 +1086,8 @@ static void check_object(struct object_entry *entry)
                         */
                        entry->size = get_size_from_delta(p, &w_curs,
                                        entry->in_pack_offset + entry->in_pack_header_size);
                         */
                        entry->size = get_size_from_delta(p, &w_curs,
                                        entry->in_pack_offset + entry->in_pack_header_size);

+                       if (entry->size == 0)
+                               goto give_up;

                        unuse_pack(&w_curs);
                        return;
                }
                        unuse_pack(&w_curs);
                        return;
                }


@@ -1087,6 +1097,7 @@ static void check_object(struct object_entry *entry)
                 * with sha1_object_info() to find about the object type
                 * at this point...
                 */
                 * with sha1_object_info() to find about the object type
                 * at this point...
                 */

+               give_up:

                unuse_pack(&w_curs);
        }
 
                unuse_pack(&w_curs);
        }