kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Patrick Steinhardt 2024-06-11 11:20:38 +02:00 committed by Junio C Hamano
parent f46ede661f
commit c6eb58bfb1
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.c
View File

@ -1565,6 +1565,7 @@ static int git_default_core_config(const char *var, const char *value,
if (!strcmp(var, "core.notesref")) { if (!strcmp(var, "core.notesref")) {
if (!value) if (!value)
return config_error_nonbool(var); return config_error_nonbool(var);
free(notes_ref_name);
notes_ref_name = xstrdup(value); notes_ref_name = xstrdup(value);
return 0; return 0;
} }

1
t/t3308-notes-merge.sh
View File

@ -5,6 +5,7 @@


test_description='Test merging of notes trees' test_description='Test merging of notes trees'


TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh


test_expect_success setup ' test_expect_success setup '

1
t/t3309-notes-merge-auto-resolve.sh
View File

@ -5,6 +5,7 @@


test_description='Test notes merging with auto-resolving strategies' test_description='Test notes merging with auto-resolving strategies'


TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh


# Set up a notes merge scenario with all kinds of potential conflicts # Set up a notes merge scenario with all kinds of potential conflicts