diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-11-05 07:17:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-11-04 22:37:55 -0800 |
| commit | d06e3ec858d4863baa5f918db414e890b08891d7 (patch) | |
| tree | 8ec0966b32e9ad98a12e0e48e0216dce5b64b219 | |
| parent | 1a99173de0618636fdd534f46b866a9bb39e487d (diff) | |
| download | git-d06e3ec858d4863baa5f918db414e890b08891d7.tar.xz | |
builtin/tag: fix leaking key ID on failure to sign
We do not free the key ID when signing a tag fails. Do so by using
the common exit path.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/tag.c | 2 | ||||
| -rwxr-xr-x | t/t7004-tag.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/builtin/tag.c b/builtin/tag.c index 93d10d5915..c37c0a68fd 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -164,7 +164,7 @@ static int do_sign(struct strbuf *buffer, struct object_id **compat_oid, int ret = -1; if (sign_buffer(buffer, &sig, keyid)) - return -1; + goto out; if (compat) { const struct git_hash_algo *algo = the_repository->hash_algo; diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index b1316e62f4..42b3327e69 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -10,6 +10,7 @@ Tests for operations with tags.' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh . "$TEST_DIRECTORY"/lib-gpg.sh . "$TEST_DIRECTORY"/lib-terminal.sh |