mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport-helper: plug strbuf and string_list leaks

Browse Source 
Transfer ownership of detached strbufs to string_lists of the
duplicating variety by calling string_list_append_nodup() instead of
string_list_append() to avoid duplicating and then leaking the buffer.

While at it make sure to release the string_list when done;
push_refs_with_export() already does that.

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2017-12-08 18:29:31 +01:00
committed by Junio C Hamano
parent 3013dff866
commit 176cb979fe
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
transport-helper.c
View File

@ -881,7 +881,8 @@ static int push_refs_with_push(struct transport *transport,
struct strbuf cas = STRBUF_INIT; struct strbuf cas = STRBUF_INIT;
strbuf_addf(&cas, "%s:%s", strbuf_addf(&cas, "%s:%s",
ref->name, oid_to_hex(&ref->old_oid_expect)); ref->name, oid_to_hex(&ref->old_oid_expect));
string_list_append(&cas_options, strbuf_detach(&cas, NULL)); string_list_append_nodup(&cas_options,
strbuf_detach(&cas, NULL));
} }
} }
if (buf.len == 0) { if (buf.len == 0) {
@ -896,6 +897,7 @@ static int push_refs_with_push(struct transport *transport,
strbuf_addch(&buf, '\n'); strbuf_addch(&buf, '\n');
sendline(data, &buf); sendline(data, &buf);
strbuf_release(&buf); strbuf_release(&buf);
string_list_clear(&cas_options, 0);
return push_update_refs_status(data, remote_refs, flags); return push_update_refs_status(data, remote_refs, flags);
} }
@ -929,7 +931,8 @@ static int push_refs_with_export(struct transport *transport,
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name); private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
if (private && !get_oid(private, &oid)) { if (private && !get_oid(private, &oid)) {
strbuf_addf(&buf, "^%s", private); strbuf_addf(&buf, "^%s", private);
string_list_append(&revlist_args, strbuf_detach(&buf, NULL)); string_list_append_nodup(&revlist_args,
strbuf_detach(&buf, NULL));
oidcpy(&ref->old_oid, &oid); oidcpy(&ref->old_oid, &oid);
} }
free(private); free(private);