From: Nicolas Pitre Date: Mon, 21 Jan 2008 16:07:15 +0000 (-0500) Subject: pack-objects: Fix segfault when object count is less than thread count X-Git-Tag: v1.5.4-rc5~17 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6fc74703dee571859d8be270f5496f4c9b2ff9c7;p=git.git pack-objects: Fix segfault when object count is less than thread count When partitioning the work amongst threads, dividing the number of objects by the number of threads may return 0 when there are less objects than threads; this will cause the subsequent code to segfault when accessing list[sub_size-1]. Allow some threads to have zero objects to work on instead of barfing, while letting others to have more. Signed-off-by: Junio C Hamano --- diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index ec10238e4..d3efeff03 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1672,7 +1672,8 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size, p[i].data_ready = 0; /* try to split chunks on "path" boundaries */ - while (sub_size < list_size && list[sub_size]->hash && + while (sub_size && sub_size < list_size && + list[sub_size]->hash && list[sub_size]->hash == list[sub_size-1]->hash) sub_size++;