From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39276 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5FHm-0003kP-Ap for qemu-devel@nongnu.org; Thu, 31 Mar 2011 06:39:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5FHg-0000W8-R0 for qemu-devel@nongnu.org; Thu, 31 Mar 2011 06:39:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5FHg-0000W3-HQ for qemu-devel@nongnu.org; Thu, 31 Mar 2011 06:39:24 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2VAdNwU008391 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 31 Mar 2011 06:39:23 -0400 From: Kevin Wolf Date: Thu, 31 Mar 2011 12:41:37 +0200 Message-Id: <1301568097-8319-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com bdrv_delete must not be called for a NULL BlockDriverState. Signed-off-by: Kevin Wolf --- 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