diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-12 23:11:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-12 23:11:41 (GMT) |
| commit | cde28af37b19e07139ebb6a355d742e763b7a235 (patch) | |
| tree | ada3dee983c5b908d908a8b9837eeea2f0e335ad /fmt-merge-msg.c | |
| parent | 90d242d36e248acfae0033274b524bfa55a947fd (diff) | |
| parent | c39fc06b999305963600358f3f5e99698440cad2 (diff) | |
| download | git-cde28af37b19e07139ebb6a355d742e763b7a235.zip git-cde28af37b19e07139ebb6a355d742e763b7a235.tar.gz git-cde28af37b19e07139ebb6a355d742e763b7a235.tar.bz2 | |
Merge branch 'fs/ssh-signing-key-lifetime'
"git merge $signed_tag" started to drop the tag message from the
default merge message it uses by accident, which has been corrected.
* fs/ssh-signing-key-lifetime:
fmt-merge-msg: prevent use-after-free with signed tags
Diffstat (limited to 'fmt-merge-msg.c')
| -rw-r--r-- | fmt-merge-msg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c index e5c0aff..baca57d 100644 --- a/fmt-merge-msg.c +++ b/fmt-merge-msg.c @@ -541,7 +541,6 @@ static void fmt_merge_msg_sigs(struct strbuf *out) else strbuf_addstr(&sig, sigc.output); } - signature_check_clear(&sigc); if (!tag_number++) { fmt_tag_signature(&tagbuf, &sig, buf, len); @@ -565,6 +564,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out) } strbuf_release(&payload); strbuf_release(&sig); + signature_check_clear(&sigc); next: free(origbuf); } |