]> git.proxmox.com Git - qemu.git/commitdiff
qemu-img rebase: Fix segfault if backing file can't be opened
authorKevin Wolf <kwolf@redhat.com>
Thu, 31 Mar 2011 10:39:51 +0000 (12:39 +0200)
committerKevin Wolf <kwolf@redhat.com>
Thu, 7 Apr 2011 11:51:48 +0000 (13:51 +0200)
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>
qemu-img.c

index 074388ce89cc8b4f3c9fb9e2c5071b04dcc1aba5..d9c2c12fa0522cbe5ed950c8cff5a00ddf7bfe72 100644 (file)
@@ -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);