]> git.proxmox.com Git - mirror_qemu.git/commitdiff
qemu-img: assert block_job_get() does not return NULL in img_commit()
authorLiam Merwick <Liam.Merwick@oracle.com>
Mon, 5 Nov 2018 21:38:37 +0000 (21:38 +0000)
committerMax Reitz <mreitz@redhat.com>
Mon, 12 Nov 2018 16:49:21 +0000 (17:49 +0100)
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>
qemu-img.c

index 4c96db7ba468aa9a2c6a717740227790b0e89376..13a6ca31b402ea50f036cb5db57bd8412a8caee2 100644 (file)
@@ -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;