builtin/multi-pack-index.c: don't leak concatenated options

The `multi-pack-index` builtin dynamically allocates an array of
command-line option for each of its separate modes by calling
add_common_options() to concatante the common options with sub-command
specific ones.

Because this operation allocates a new array, we have to be careful to
remember to free it. We already do this in the repack and write
sub-commands, but verify and expire don't. Rectify this by calling
FREE_AND_NULL as the other modes do.

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

diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index 075d15d706246a7e4f6a4ec3faecaebce220399f..4480ba398277d4edc67e60eff47686d579de53c8 100644 (file)
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -167,6 +167,8 @@ static int cmd_multi_pack_index_verify(int argc, const char **argv)
                usage_with_options(builtin_multi_pack_index_verify_usage,
                                   options);
 
+       FREE_AND_NULL(options);
+
        return verify_midx_file(the_repository, opts.object_dir, opts.flags);
 }
 
@@ -191,6 +193,8 @@ static int cmd_multi_pack_index_expire(int argc, const char **argv)
                usage_with_options(builtin_multi_pack_index_expire_usage,
                                   options);
 
+       FREE_AND_NULL(options);
+
        return expire_midx_packs(the_repository, opts.object_dir, opts.flags);
 }