From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 30 Mar 2017 12:03:45 +0000 (+0200)
Subject: qemuDomainSnapshotPrepare: Don't always assume vm->def->os.loader
X-Git-Tag: v3.2.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa3b51071157885c40d76e3f18a7fdb2e6e74b39;p=thirdparty%2Flibvirt.git

qemuDomainSnapshotPrepare: Don't always assume vm->def->os.loader

In 9e2465834 a check that denies internal snapshots when pflash
based loader is configured for the domain. However, if there's
none and an user tries to do an internal snapshot they will
witness daemon crash as in that case vm->def->os.loader is NULL
and we dereference it unconditionally.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 40c2eabad1..3cc4f4d669 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13889,6 +13889,7 @@ qemuDomainSnapshotPrepare(virConnectPtr conn,
      * Avoid the issues by forbidding internal snapshot with pflash completely.
      */
     if (found_internal &&
+        vm->def->os.loader &&
         vm->def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_PFLASH) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("internal snapshots of a VM with pflash based "