From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMLJt-0002pH-9d for qemu-devel@nongnu.org; Tue, 26 Aug 2014 14:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMLJm-0000II-G7 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 14:18:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMLJm-0000ID-91 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 14:18:06 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7QII5CI032185 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Aug 2014 14:18:05 -0400 From: Stefan Hajnoczi Date: Tue, 26 Aug 2014 19:17:55 +0100 Message-Id: <1409077076-29855-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1409077076-29855-1-git-send-email-stefanha@redhat.com> References: <1409077076-29855-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] qemu-img: fix img_compare() flags error path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Jeff Cody , jsnow@redhat.com, Markus Armbruster , Stefan Hajnoczi If img_compare() fails to parse the cache flags the goto out3 code path will call qemu_progress_end(). Make sure we actually call qemu_progress_init() first. Reported-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index dc3adb5..01750b7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1018,6 +1018,9 @@ static int img_compare(int argc, char **argv) filename1 = argv[optind++]; filename2 = argv[optind++]; + /* Initialize before goto out */ + qemu_progress_init(progress, 2.0); + flags = BDRV_O_FLAGS; ret = bdrv_parse_cache_flags(cache, &flags); if (ret < 0) { @@ -1026,9 +1029,6 @@ static int img_compare(int argc, char **argv) goto out3; } - /* Initialize before goto out */ - qemu_progress_init(progress, 2.0); - bs1 = bdrv_new_open("image 1", filename1, fmt1, flags, true, quiet); if (!bs1) { error_report("Can't open file %s", filename1); -- 1.9.3