Commit eb863add authored by Kevin Wolf's avatar Kevin Wolf
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@linux.vnet.ibm.com>
parent 6b837bc4

qemu-img.c

+6 −2
Original line number Diff line number Diff line
@@ -1411,9 +1411,13 @@ out: 
    qemu_progress_end();

    /* Cleanup */

    if (!unsafe) {

        if (bs_old_backing != NULL) {

            bdrv_delete(bs_old_backing);

        }

        if (bs_new_backing != NULL) {

            bdrv_delete(bs_new_backing);

        }

    }



    bdrv_delete(bs);

    if (ret) {