test-tool delta: fix a memory leak

Fix a memory leak introduced in a310d434946 ([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>

diff --git a/t/helper/test-delta.c b/t/helper/test-delta.c
index e749a49c88e66e4b3ce388b2c0762d36d4090f99..b15481ea596dcdd2337a4dd9d99761ecb5514ea4 100644 (file)
--- a/t/helper/test-delta.c
+++ b/t/helper/test-delta.c
@@ -20,8 +20,9 @@ int cmd__delta(int argc, const char **argv)
 {
        int fd;
        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;
+       int ret = 1;
 
        if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
                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) {
                perror(argv[2]);
                close(fd);
-               return 1;
+               goto cleanup;
        }
        close(fd);
 
        fd = open(argv[3], O_RDONLY);
        if (fd < 0 || fstat(fd, &st)) {
                perror(argv[3]);
-               return 1;
+               goto cleanup;
        }
        data_size = st.st_size;
        data_buf = xmalloc(data_size);
        if (read_in_full(fd, data_buf, data_size) < 0) {
                perror(argv[3]);
                close(fd);
-               return 1;
+               goto cleanup;
        }
        close(fd);
 
@@ -66,14 +67,20 @@ int cmd__delta(int argc, const char **argv)
                                      &out_size);
        if (!out_buf) {
                fprintf(stderr, "delta operation failed (returned NULL)\n");
-               return 1;
+               goto cleanup;
        }
 
        fd = open (argv[4], O_WRONLY|O_CREAT|O_TRUNC, 0666);
        if (fd < 0 || write_in_full(fd, out_buf, out_size) < 0) {
                perror(argv[4]);
-               return 1;
+               goto cleanup;
        }
 
-       return 0;
+       ret = 0;
+cleanup:
+       free(from_buf);
+       free(data_buf);
+       free(out_buf);
+
+       return ret;
 }

diff --git a/t/t5303-pack-corruption-resilience.sh b/t/t5303-pack-corruption-resilience.sh
index 41e6dc4dcfc5163c8db4d7875567162ea7cc1828..2926e8dfc41223cc0030685beec8f6612db25a4d 100755 (executable)
--- a/t/t5303-pack-corruption-resilience.sh
+++ b/t/t5303-pack-corruption-resilience.sh
@@ -4,6 +4,8 @@
 #
 
 test_description='resilience to pack corruptions with redundant objects'
+
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 # Note: the test objects are created with knowledge of their pack encoding