From dd53ec1c12e0794fed80bc9596d9da7823a61714 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Mon, 4 Mar 2013 16:39:55 -0600 Subject: [PATCH] btrfs-progs: free allocated metadump structure on restore failure Don't return w/ "metadump" still allocated Signed-off-by: Eric Sandeen --- btrfs-image.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/btrfs-image.c b/btrfs-image.c index a54e6c9..5b0af28 100644 --- a/btrfs-image.c +++ b/btrfs-image.c @@ -765,11 +765,11 @@ static int wait_for_worker(struct mdrestore_struct *mdres) static int restore_metadump(const char *input, FILE *out, int num_threads) { - struct meta_cluster *cluster; + struct meta_cluster *cluster = NULL; struct meta_cluster_header *header; struct mdrestore_struct mdrestore; u64 bytenr = 0; - FILE *in; + FILE *in = NULL; int ret; if (!strcmp(input, "-")) { @@ -797,14 +797,15 @@ static int restore_metadump(const char *input, FILE *out, int num_threads) if (le64_to_cpu(header->magic) != HEADER_MAGIC || le64_to_cpu(header->bytenr) != bytenr) { fprintf(stderr, "bad header in metadump image\n"); - return 1; + ret = 1; + goto out; } ret = add_cluster(cluster, &mdrestore, &bytenr); BUG_ON(ret); wait_for_worker(&mdrestore); } - +out: mdrestore_destroy(&mdrestore); free(cluster); if (in != stdin) -- 2.7.4