From: Liam Merwick <Liam.Merwick@oracle.com>
Date: Mon, 5 Nov 2018 21:38:37 +0000 (+0000)
Subject: qemu-img: assert block_job_get() does not return NULL in img_commit()
X-Git-Tag: qemu-xen-4.13.0-rc1~552^2^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2e2db260093d44130a8a2974aed3cc8149c0a08d;p=qemu-xen.git

qemu-img: assert block_job_get() does not return NULL in img_commit()

Although the function block_job_get() can return NULL, it would be a
serious bug if it did so (because the job yields before executing anything
(if it started successfully); but otherwise, commit_active_start() would
have returned an error).  However, as a precaution, before dereferencing
the 'job' pointer in img_commit() assert it is not NULL.

Signed-off-by: Liam Merwick <Liam.Merwick@oracle.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 1541453919-25973-4-git-send-email-Liam.Merwick@oracle.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/qemu-img.c b/qemu-img.c
index 4c96db7ba4..13a6ca31b4 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1029,6 +1029,7 @@ static int img_commit(int argc, char **argv)
     }
 
     job = block_job_get("commit");
+    assert(job);
     run_block_job(job, &local_err);
     if (local_err) {
         goto unref_backing;