linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] btrfs-progs: btrfs-image: don't segfault if no root is found
@ 2012-07-09 21:18 Arnd Hannemann
  0 siblings, 0 replies; only message in thread
From: Arnd Hannemann @ 2012-07-09 21:18 UTC (permalink / raw)
  To: linux-btrfs; +Cc: chris.mason, Arnd Hannemann

Error reporting is already done, so just return if root is NULL,
instead of segfaulting:

Program received signal SIGSEGV, Segmentation fault.
0x000000000042cd34 in create_metadump (input=0x7fffffffe847 "/usr/share", out=0x63e010, num_threads=0, compress_level=0)
    at btrfs-image.c:494
494		BUG_ON(root->nodesize != root->leafsize);
    at btrfs-image.c:494

Signed-off-by: Arnd Hannemann <arnd@arndnet.de>
---
 btrfs-image.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/btrfs-image.c b/btrfs-image.c
index f2bbcc8..fec51d8 100644
--- a/btrfs-image.c
+++ b/btrfs-image.c
@@ -491,6 +491,8 @@ static int create_metadump(const char *input, FILE *out, int num_threads,
 	int ret;
 
 	root = open_ctree(input, 0, 0);
+	if (!root)
+		return 1;
 	BUG_ON(root->nodesize != root->leafsize);
 
 	ret = metadump_init(&metadump, root, out, num_threads,
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2012-07-09 21:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-09 21:18 [PATCH] btrfs-progs: btrfs-image: don't segfault if no root is found Arnd Hannemann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).