Commit 660b3735 authored by Duy Nguyen's avatar Duy Nguyen Committed by Junio C Hamano

pack-objects: don't check size when the object is bad

sha1_object_info() in check_objects() may fail to locate an object in
the pack and return type OBJ_BAD. In that case, it will likely leave
the "size" field untouched. We delay error handling until later in
prepare_pack() though. Until then, do not touch "size" field.

This field should contain the default value zero, but we can't say
sha1_object_info() cannot damage it. This becomes more important later
when the object size may have to be retrieved back from the
(non-existing) pack.
Signed-off-by: Duy Nguyen's avatarNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 0cb3c142
......@@ -1742,7 +1742,7 @@ static void get_object_details(void)
for (i = 0; i < to_pack.nr_objects; i++) {
struct object_entry *entry = sorted_by_offset[i];
check_object(entry);
if (big_file_threshold < entry->size)
if (entry->type_valid && big_file_threshold < entry->size)
entry->no_try_delta = 1;
}
......@@ -2453,7 +2453,7 @@ static void prepare_pack(int window, int depth)
*/
continue;
if (entry->size < 50)
if (!entry->type_valid || entry->size < 50)
continue;
if (entry->no_try_delta)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment