[PATCH 2/4] shallow: fix memory leak when registering shallow roots
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 6, 2023, 10:45 UTC
- Message-ID
- <137c150e358a8248200e0c7174a79358adb92e45.1699267422.git.ps@pks.im>
- In-Reply-To
- <cover.1699267422.git.ps@pks.im>
When registering shallow roots, we unset the list of parents of the to-be-registered commit if it's already been parsed. This causes us to leak memory though because we never free this list. Fix this.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- shallow.c | 4 +++- t/t5311-pack-bitmaps-shallow.sh | 2 ++ t/t5530-upload-pack-error.sh | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/shallow.c b/shallow.c index 5413719fd4e..ac728cdd778 100644 --- a/shallow.c +++ b/shallow.c @@ -38,8 +38,10 @@ int register_shallow(struct repository *r, const struct object_id *oid) oidcpy(&graft->oid, oid); graft->nr_parent = -1; - if (commit && commit->object.parsed) + if (commit && commit->object.parsed) { + free_commit_list(commit->parents); commit->parents = NULL; + } return register_commit_graft(r, graft, 0); } diff --git a/t/t5311-pack-bitmaps-shallow.sh b/t/t5311-pack-bitmaps-shallow.sh index 9dae60f73e3..4fe71fe8cd2 100755 --- a/t/t5311-pack-bitmaps-shallow.sh +++ b/t/t5311-pack-bitmaps-shallow.sh @@ -1,6 +1,8 @@ #!/bin/sh test_description='check bitmap operation with shallow repositories' + +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # We want to create a situation where the shallow, grafted diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index 7c1460eaa99..de6e14a6c24 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -2,6 +2,7 @@ test_description='errors in upload-pack' +TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh D=$(pwd)
-- 2.42.0