mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 04:49:43 +01:00
Code Activity

bundle-uri: plug leak in unbundle_from_file()

Browse source 
The function `unbundle_from_file()` has two memory leaks:

  - We do not release the `struct bundle_header header` when hitting
    errors because we return early without any cleanup.

  - We do not release the `struct strbuf bundle_ref` at all.

Plug these leaks by creating a common exit path where both of these
variables are released.

While at it, refactor the code such that the variable assignments do not
happen inside the conditional statement itself according to our coding
style.

Signed-off-by: Toon Claes <toon@iotcl.com>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Toon Claes 2024-10-10 11:12:49 +02:00 committed by Junio C Hamano
parent 777489f9e0
commit 6dab49b9fb
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
bundle-uri.c
View file

@ -368,17 +368,23 @@ static int unbundle_from_file(struct repository *r, const char *file)
struct strbuf bundle_ref = STRBUF_INIT; struct strbuf bundle_ref = STRBUF_INIT;
size_t bundle_prefix_len; size_t bundle_prefix_len;
if ((bundle_fd = read_bundle_header(file, &header)) < 0) bundle_fd = read_bundle_header(file, &header);
return 1; if (bundle_fd < 0) {
result = 1;
goto cleanup;
}
/* /*
* Skip the reachability walk here, since we will be adding * Skip the reachability walk here, since we will be adding
* a reachable ref pointing to the new tips, which will reach * a reachable ref pointing to the new tips, which will reach
* the prerequisite commits. * the prerequisite commits.
*/ */
if ((result = unbundle(r, &header, bundle_fd, NULL, result = unbundle(r, &header, bundle_fd, NULL,
VERIFY_BUNDLE_QUIET | (fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK : 0)))) VERIFY_BUNDLE_QUIET | (fetch_pack_fsck_objects() ? VERIFY_BUNDLE_FSCK : 0));
return 1; if (result) {
result = 1;
goto cleanup;
}
/* /*
* Convert all refs/heads/ from the bundle into refs/bundles/ * Convert all refs/heads/ from the bundle into refs/bundles/
@ -407,6 +413,8 @@ static int unbundle_from_file(struct repository *r, const char *file)
0, UPDATE_REFS_MSG_ON_ERR); 0, UPDATE_REFS_MSG_ON_ERR);
} }
cleanup:
strbuf_release(&bundle_ref);
bundle_header_release(&header); bundle_header_release(&header);
return result; return result;
} }