diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-06-11 11:20:38 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-11 13:15:07 -0700 |
| commit | c6eb58bfb19a0840841934b91613ea53f0da8651 (patch) | |
| tree | 37e3c4304e8b4b9e140fce4b3bbe4911fb42f061 | |
| parent | f46ede661face3c57f31097960c00325cf21f67f (diff) | |
| download | git-c6eb58bfb19a0840841934b91613ea53f0da8651.tar.gz | |
config: fix leaking "core.notesref" variable
The variable used to track the "core.notesref" config is not getting
freed before we assign to it and thus leaks. Fix this.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | config.c | 1 | ||||
| -rwxr-xr-x | t/t3308-notes-merge.sh | 1 | ||||
| -rwxr-xr-x | t/t3309-notes-merge-auto-resolve.sh | 1 |
3 files changed, 3 insertions, 0 deletions
@@ -1565,6 +1565,7 @@ static int git_default_core_config(const char *var, const char *value, if (!strcmp(var, "core.notesref")) { if (!value) return config_error_nonbool(var); + free(notes_ref_name); notes_ref_name = xstrdup(value); return 0; } diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh index 202702be1a..e1d05ff6bc 100755 --- a/t/t3308-notes-merge.sh +++ b/t/t3308-notes-merge.sh @@ -5,6 +5,7 @@ test_description='Test merging of notes trees' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success setup ' diff --git a/t/t3309-notes-merge-auto-resolve.sh b/t/t3309-notes-merge-auto-resolve.sh index 9bd5dbf341..f55277f499 100755 --- a/t/t3309-notes-merge-auto-resolve.sh +++ b/t/t3309-notes-merge-auto-resolve.sh @@ -5,6 +5,7 @@ test_description='Test notes merging with auto-resolving strategies' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # Set up a notes merge scenario with all kinds of potential conflicts |