diff options
| author |  René Scharfe <l.s.r@web.de> | 2017-12-07 21:22:49 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-07 12:34:35 -0800 |
| commit | addcf6cfdeb24a2ae589cbdd0ac1e754310b9ca8 (patch) | |
| tree | 5afdeb850417b4bfc779d1996e809e932150b117 | |
| parent | Git 2.12.5 (diff) | |
| download | tgif-addcf6cfdeb24a2ae589cbdd0ac1e754310b9ca8.tar.xz | |
fmt-merge-msg: avoid leaking strbuf in shortlog()
Use string_list_append_nodup() instead of string_list_append() to hand
over ownership of a detached strbuf and thus avoid leaking its memory.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/fmt-merge-msg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index efab62fd85..578a0a20e1 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -376,7 +376,8 @@ static void shortlog(const char *name, string_list_append(&subjects, oid_to_hex(&commit->object.oid)); else - string_list_append(&subjects, strbuf_detach(&sb, NULL)); + string_list_append_nodup(&subjects, + strbuf_detach(&sb, NULL)); } if (opts->credit_people) |