list-objects-filter: initialize sub-filter structs

Since commit c54980ab83 (list-objects-filter: convert filter_spec to a strbuf, 2022-09-11), building with SANITIZE=undefined triggers an error in t5616. The problem is that we end up with a strbuf that has been zero-initialized instead of via STRBUF_INIT. Feeding that strbuf to strbuf_addbuf() in list_objects_filter_copy() means we will call memcpy like: memcpy(some_actual_buffer, NULL, 0); This works on most systems because we're copying zero bytes, but it is technically undefined behavior to ever pass NULL to memcpy. Even though c54980ab83 is where the bug manifests, that is only because we switched away from a string_list, which is OK with being zero-initialized (though it may cause other problems by not duplicating the strings, it happened to be OK in this instance). The actual bug is caused by the commit before that, 2a01bdedf8 (list-objects-filter: add and use initializers, 2022-09-11). There we consistently initialize the top-level filter structs, but we forgot the dynamically allocated ones we stick in filter_options->sub when creating combined filters. Note that we need to fix two spots here: where we parse a "combine:" filter, but also where we transform from a single-filter into a combined one after seeing multiple "--filter" options. In the second spot, we'll do some minor refactoring to avoid repeating our very-long array index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Sep 22, 2022 at 05:35 UTC 4eaed7c2f2aed1ef510ff97e7e91fa0cbcbef65d
1 file changed +7 -3
list-objects-filter-options.c
+7 -3
@@ -143,6 +143,7 @@ static int parse_combine_subfilter(
143
144 ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
145 filter_options->sub_alloc);
146 + list_objects_filter_init(&filter_options->sub[new_index]);
147
148 decoded = url_percent_decode(subspec->buf);
149
@@ -263,6 +264,8 @@ void parse_list_objects_filter(
264 parse_error = gently_parse_list_objects_filter(
265 filter_options, arg, &errbuf);
266 } else {
267 + struct list_objects_filter_options *sub;
268 +
269 /*
270 * Make filter_options an LOFC_COMBINE spec so we can trivially
271 * add subspecs to it.
@@ -273,10 +276,11 @@ void parse_list_objects_filter(
276 filter_spec_append_urlencode(filter_options, arg);
277 ALLOC_GROW_BY(filter_options->sub, filter_options->sub_nr, 1,
278 filter_options->sub_alloc);
279 + sub = &filter_options->sub[filter_options->sub_nr - 1];
280
277 - parse_error = gently_parse_list_objects_filter(
278 - &filter_options->sub[filter_options->sub_nr - 1], arg,
279 - &errbuf);
281 + list_objects_filter_init(sub);
282 + parse_error = gently_parse_list_objects_filter(sub, arg,
283 + &errbuf);
284 }
285 if (parse_error)
286 die("%s", errbuf.buf);