pack-bitmap.c: ensure that eindex lookups don't overflow

When a bitmap is used to answer some reachability query, it creates a
pseudo-bitmap called the "extended index" on top of any existing bitmaps
to store objects that are relevant to the query, but not mentioned in
the bitmap.

When looking up the ith object in the extended index in a bitmap, it is
common to write something like:

    bitmap_get(result, i + bitmap_num_objects(bitmap_git))

, indicating that we want the ith object following all other objects
mentioned in the bitmap_git.

Since the type of `i` and the return type of `bitmap_num_objects()` are
both `uint32_t`s,  But if there are either a large number of objects in
the bitmap, or a large number of objects in the extended index (or
both), this addition can overflow when the sum is greater than 2^32-1.

Having that large of a bitmap position is entirely acceptable, but we
need to ensure that the computed bitmap position for that object is
performed using 64-bits and doesn't overflow.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 999f962602da7d1aae2e90cb620c0ffb42a7f510..ed9294deb8772ad08d764d82f7b1bddd7560e54c 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -1152,7 +1152,7 @@ static void show_extended_objects(struct bitmap_index *bitmap_git,
        for (i = 0; i < eindex->count; ++i) {
                struct object *obj;
 
-               if (!bitmap_get(objects, bitmap_num_objects(bitmap_git) + i))
+               if (!bitmap_get(objects, st_add(bitmap_num_objects(bitmap_git), i)))
                        continue;
 
                obj = eindex->objects[i];
@@ -1331,7 +1331,7 @@ static void filter_bitmap_exclude_type(struct bitmap_index *bitmap_git,
         * them individually.
         */
        for (i = 0; i < eindex->count; i++) {
-               uint32_t pos = i + bitmap_num_objects(bitmap_git);
+               size_t pos = st_add(i, bitmap_num_objects(bitmap_git));
                if (eindex->objects[i]->type == type &&
                    bitmap_get(to_filter, pos) &&
                    !bitmap_get(tips, pos))
@@ -1422,7 +1422,7 @@ static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git,
        }
 
        for (i = 0; i < eindex->count; i++) {
-               uint32_t pos = i + bitmap_num_objects(bitmap_git);
+               size_t pos = st_add(i, bitmap_num_objects(bitmap_git));
                if (eindex->objects[i]->type == OBJ_BLOB &&
                    bitmap_get(to_filter, pos) &&
                    !bitmap_get(tips, pos) &&
@@ -1873,7 +1873,8 @@ static uint32_t count_object_type(struct bitmap_index *bitmap_git,
 
        for (i = 0; i < eindex->count; ++i) {
                if (eindex->objects[i]->type == type &&
-                       bitmap_get(objects, bitmap_num_objects(bitmap_git) + i))
+                   bitmap_get(objects,
+                              st_add(bitmap_num_objects(bitmap_git), i)))
                        count++;
        }
 
@@ -2287,7 +2288,8 @@ static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git)
        for (i = 0; i < eindex->count; i++) {
                struct object *obj = eindex->objects[i];
 
-               if (!bitmap_get(result, bitmap_num_objects(bitmap_git) + i))
+               if (!bitmap_get(result,
+                               st_add(bitmap_num_objects(bitmap_git), i)))
                        continue;
 
                if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)