Re: [PATCH 3/3] ref-filter: free item->value and item->value->s
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 11, 2018, 01:19 UTC
- Message-ID
- <xmqqzhvli8kl.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <0102016657e7d087-be1f65a3-be3e-4b15-95f1-7570d258c70d-000000@eu-west-1.amazonses.com>
Olga Telezhnaya <olyatelezhnaya@gmail.com> writes:
> Release item->value. > Initialize item->value->s dynamically and then release its resources. > Release some local variables.
Again, "why" is lacking.
Show 8 quoted lines
> @@ -1373,36 +1379,31 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
> }
> } else if (atom->u.remote_ref.option == RR_TRACKSHORT) {
> if (stat_tracking_info(branch, &num_ours, &num_theirs,
> - NULL, AHEAD_BEHIND_FULL) < 0)
> + NULL, AHEAD_BEHIND_FULL) < 0) {
> + *s = xstrdup("");
> return;It is a bit sad that we need to sprinkle xstrdup() all over the place, but I do not offhand think of a better alternative to ensure that it is safe to blindly free the .s field.
Show 5 quoted lines
> - if (explicit)
> - *s = xstrdup(remote);
> - else
> - *s = "";
> + *s = explicit ? xstrdup(remote) : xstrdup("");Next time, please avoid mixing this kind of unrelated changes with the main theme (i.e. "the original had allocated and static pieces of memory pointed by the same variable, which made it impossible to blindly free it, so make sure everything is allocated"). It makes it harder to let reviewers' eyes coast over the patch.
I say "Next time" because the change is already written this time, and I already spent time to see it was an OK change. By the way,
*s = xstrdup(explicit ? remote : "");
is probably shorter.
Show 5 quoted lines
> @@ -1562,10 +1566,11 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err) > if (!refname) > continue; > } > + free((char *)v->s); // we will definitely re-init it on the next line
No // comment, please.
Show 9 quoted lines
> static void free_array_item(struct ref_array_item *item)
> {
> free((char *)item->symref);
> + if (item->value) {
> + free((char *)item->value->s);
> + free(item->value);
> + }
> free(item);
> }OK.