From: Kevin Wolf <kwolf@redhat.com>
Date: Thu, 31 Mar 2011 10:39:51 +0000 (+0200)
Subject: qemu-img rebase: Fix segfault if backing file can't be opened
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eb863add0204210480d018a3298ca22e4eadf3ce;p=qemu.git

qemu-img rebase: Fix segfault if backing file can't be opened

bdrv_delete must not be called for a NULL BlockDriverState.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/qemu-img.c b/qemu-img.c
index 074388ce89..d9c2c12fa0 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1411,8 +1411,12 @@ out:
     qemu_progress_end();
     /* Cleanup */
     if (!unsafe) {
-        bdrv_delete(bs_old_backing);
-        bdrv_delete(bs_new_backing);
+        if (bs_old_backing != NULL) {
+            bdrv_delete(bs_old_backing);
+        }
+        if (bs_new_backing != NULL) {
+            bdrv_delete(bs_new_backing);
+        }
     }
 
     bdrv_delete(bs);