From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35992 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7qUP-0005VO-Rr for qemu-devel@nongnu.org; Thu, 07 Apr 2011 10:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q7qUN-0004rp-Ra for qemu-devel@nongnu.org; Thu, 07 Apr 2011 10:47:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q7qUN-0004rE-24 for qemu-devel@nongnu.org; Thu, 07 Apr 2011 10:47:15 -0400 From: Kevin Wolf Date: Thu, 7 Apr 2011 16:49:15 +0200 Message-Id: <1302187764-16421-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1302187764-16421-1-git-send-email-kwolf@redhat.com> References: <1302187764-16421-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 06/15] qemu-img rebase: Fix segfault if backing file can't be opened List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org bdrv_delete must not be called for a NULL BlockDriverState. Signed-off-by: Kevin Wolf Reviewed-by: Stefan Hajnoczi --- qemu-img.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 074388c..d9c2c12 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); -- 1.7.2.3