undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-tool delta: fix a memory leak

Browse Source 
Fix a memory leak introduced in a310d43494 ([PATCH] Deltification
library work by Nicolas Pitre., 2005-05-19), as a result we can mark
another test as passing with SANITIZE=leak using
"TEST_PASSES_SANITIZE_LEAK=true".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-07-01 12:37:40 +02:00 committed by Junio C Hamano
parent 34e691288d
commit f40a693450
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
t/helper/test-delta.c
View File

@ -20,8 +20,9 @@ int cmd__delta(int argc, const char **argv)
{ {
int fd; int fd;
struct stat st; struct stat st;
void *from_buf, *data_buf, *out_buf; void *from_buf = NULL, *data_buf = NULL, *out_buf = NULL;
unsigned long from_size, data_size, out_size; unsigned long from_size, data_size, out_size;
int ret = 1;
if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) { if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
fprintf(stderr, "usage: %s\n", usage_str); fprintf(stderr, "usage: %s\n", usage_str);
@ -38,21 +39,21 @@ int cmd__delta(int argc, const char **argv)
if (read_in_full(fd, from_buf, from_size) < 0) { if (read_in_full(fd, from_buf, from_size) < 0) {
perror(argv[2]); perror(argv[2]);
close(fd); close(fd);
return 1; goto cleanup;
} }
close(fd); close(fd);
fd = open(argv[3], O_RDONLY); fd = open(argv[3], O_RDONLY);
if (fd < 0 || fstat(fd, &st)) { if (fd < 0 || fstat(fd, &st)) {
perror(argv[3]); perror(argv[3]);
return 1; goto cleanup;
} }
data_size = st.st_size; data_size = st.st_size;
data_buf = xmalloc(data_size); data_buf = xmalloc(data_size);
if (read_in_full(fd, data_buf, data_size) < 0) { if (read_in_full(fd, data_buf, data_size) < 0) {
perror(argv[3]); perror(argv[3]);
close(fd); close(fd);
return 1; goto cleanup;
} }
close(fd); close(fd);
@ -66,14 +67,20 @@ int cmd__delta(int argc, const char **argv)
&out_size); &out_size);
if (!out_buf) { if (!out_buf) {
fprintf(stderr, "delta operation failed (returned NULL)\n"); fprintf(stderr, "delta operation failed (returned NULL)\n");
return 1; goto cleanup;
} }
fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666); fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666);
if (fd < 0 || write_in_full(fd, out_buf, out_size) < 0) { if (fd < 0 || write_in_full(fd, out_buf, out_size) < 0) {
perror(argv[4]); perror(argv[4]);
return 1; goto cleanup;
} }
return 0; ret = 0;
cleanup:
free(from_buf);
free(data_buf);
free(out_buf);
return ret;
} }

2
t/t5303-pack-corruption-resilience.sh
View File

@ -4,6 +4,8 @@
# #
test_description='resilience to pack corruptions with redundant objects' test_description='resilience to pack corruptions with redundant objects'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
# Note: the test objects are created with knowledge of their pack encoding # Note: the test objects are created with knowledge of their pack encoding