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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user