From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34910) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHsxJ-0002jV-DP for qemu-devel@nongnu.org; Tue, 19 Mar 2013 05:35:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHsxE-0003Oj-NQ for qemu-devel@nongnu.org; Tue, 19 Mar 2013 05:35:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHsxE-0003Ob-GN for qemu-devel@nongnu.org; Tue, 19 Mar 2013 05:35:36 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2J9ZZ3f021279 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 19 Mar 2013 05:35:35 -0400 From: Alon Levy Date: Tue, 19 Mar 2013 11:35:32 +0200 Message-Id: <1363685732-20827-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH] qcow2: fix null deref apparent during migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com Signed-off-by: Alon Levy --- block/qcow2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/qcow2.c b/block/qcow2.c index 1f99866..260a1d3 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -512,7 +512,9 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags) /* Enable lazy_refcounts according to image and command line options */ opts = qemu_opts_create_nofail(&qcow2_runtime_opts); - qemu_opts_absorb_qdict(opts, options, &local_err); + if (options) { + qemu_opts_absorb_qdict(opts, options, &local_err); + } if (error_is_set(&local_err)) { qerror_report_err(local_err); error_free(local_err); -- 1.8.1.4