diff options
author | Jeff King <peff@peff.net> | 2022-09-11 05:03:07 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-09-12 15:38:59 (GMT) |
commit | 2a01bdedf87d7cbfc4411ff5059cfe406e1637db (patch) | |
tree | 7432c77712c11edbb063a809ad9858dba58c09fe /transport-helper.c | |
parent | aff4bfcf0a51a26d069ccc3a29e643a112867b27 (diff) | |
download | git-2a01bdedf87d7cbfc4411ff5059cfe406e1637db.zip git-2a01bdedf87d7cbfc4411ff5059cfe406e1637db.tar.gz git-2a01bdedf87d7cbfc4411ff5059cfe406e1637db.tar.bz2 |
list-objects-filter: add and use initializers
In 7e2619d8ff (list_objects_filter_options: plug leak of filter_spec
strings, 2022-09-08), we noted that the filter_spec string_list was
inconsistent in how it handled memory ownership of strings stored in the
list. The fix there was a bit of a band-aid to set the "strdup_strings"
variable right before adding anything.
That works OK, and it lets the users of the API continue to
zero-initialize the struct. But it makes the code a bit hard to follow
and accident-prone, as any other spots appending the filter_spec need to
think about whether to set the strdup_strings value, too (there's one
such spot in partial_clone_get_default_filter_spec(), which is probably
a possible memory leak).
So let's do that full cleanup now. We'll introduce a
LIST_OBJECTS_FILTER_INIT macro and matching function, and use them as
appropriate (though it is for the "_options" struct, this matches the
corresponding list_objects_filter_release() function).
This is harder than it seems! Many other structs, like
git_transport_data, embed the filter struct. So they need to initialize
it themselves even if the rest of the enclosing struct is OK with
zero-initialization. I found all of the relevant spots by grepping
manually for declarations of list_objects_filter_options. And then doing
so recursively for structs which embed it, and ones which embed those,
and so on.
I'm pretty sure I got everything, but there's no change that would alert
the compiler if any topics in flight added new declarations. To catch
this case, we now double-check in the parsing function that things were
initialized as expected and BUG() if appropriate.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport-helper.c')
-rw-r--r-- | transport-helper.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/transport-helper.c b/transport-helper.c index 322c722..e95267a 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -1286,6 +1286,8 @@ int transport_helper_init(struct transport *transport, const char *name) if (getenv("GIT_TRANSPORT_HELPER_DEBUG")) debug = 1; + list_objects_filter_init(&data->transport_options.filter_options); + transport->data = data; transport->vtable = &vtable; transport->smart_options = &(data->transport_options); |