development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

diffcore-break: fix leaking filespecs when merging broken pairs

Browse source 
When merging file pairs after they have been broken up we queue a new
file pair and discard the broken-up ones. The newly-queued file pair
reuses one filespec of the broken up pairs each, where the respective
other filespec gets discarded. But we only end up freeing the filespec's
data, not the filespec itself, and thus leak memory.

Fix these leaks by using `free_filespec()` instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-09-26 13:47:08 +02:00 committed by Junio C Hamano
parent fa016423c7
commit 12dfc2475c
6 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
diffcore-break.c
View file

@ -266,8 +266,8 @@ static void merge_broken(struct diff_filepair *p,
* in the resulting tree.
*/
d->one->rename_used++;
diff_free_filespec_data(d->two);
diff_free_filespec_data(c->one);
free_filespec(d->two);
free_filespec(c->one);
free(d);
free(c);
}

2
t/t4008-diff-break-rewrite.sh
View file

@ -21,6 +21,8 @@ With -B, this should be detected as two complete rewrites.
Further, with -B and -M together, these should turn into two renames.
'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash

1
t/t4022-diff-rewrite.sh
View file

@ -2,6 +2,7 @@
test_description='rewrite diff'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff-data.sh

1
t/t4023-diff-rename-typechange.sh
View file

@ -2,6 +2,7 @@
test_description='typechange rename detection'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-diff.sh

1
t/t4031-diff-rewrite-binary.sh
View file

@ -2,6 +2,7 @@
test_description='rewrite diff on binary file'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# We must be large enough to meet the MINIMUM_BREAK_SIZE

2
t/t7524-commit-summary.sh
View file

@ -1,6 +1,8 @@
#!/bin/sh
test_description='git commit summary'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '