From 64200e4453f0f23bef42919db7854b6e8ed2ceda Mon Sep 17 00:00:00 2001
From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Date: Thu, 13 Mar 2014 13:01:31 +0800
Subject: [PATCH] btrfs-progs: skip erroneous free before initialization

If the list is not initialized, don't try to free it.
Otherwise it will cause segmentfault.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
---
 mkfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mkfs.c b/mkfs.c
index 472c0b8c..dbd83f5c 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -965,7 +965,7 @@ static int make_image(char *source_dir, struct btrfs_root *root, int out_fd)
 	ret = lstat(source_dir, &root_st);
 	if (ret) {
 		fprintf(stderr, "unable to lstat the %s\n", source_dir);
-		goto fail;
+		goto out;
 	}
 
 	INIT_LIST_HEAD(&dir_head.list);
@@ -987,6 +987,7 @@ fail:
 		list_del(&dir_entry->list);
 		free(dir_entry);
 	}
+out:
 	fprintf(stderr, "Making image is aborted.\n");
 	return -1;
 }