From: Jim Meyering <meyering@redhat.com>
Date: Mon, 14 Dec 2009 16:02:56 +0000 (+0100)
Subject: qemu migration: avoid NULL-deref given an invalid input
X-Git-Tag: v0.7.5~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643ee3fa44809971476e6fd70d2c81caf1fc2524;p=thirdparty%2Flibvirt.git

qemu migration: avoid NULL-deref given an invalid input

* src/qemu/qemu_driver.c (doNonTunnelMigrate): Don't let a
NULL "uri_out" provoke a NULL-dereference in doNativeMigrate:
supply omitted goto-after-qemudReportError.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c782f0dab9..9ef6c35d3e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7430,6 +7430,7 @@ static int doNonTunnelMigrate(virDomainPtr dom,
     if (uri_out == NULL) {
         qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s",
                          _("domainMigratePrepare2 did not set uri"));
+        goto cleanup;
     }
 
     if (doNativeMigrate(dom, driver, vm, uri_out, flags, dname, resource) < 0)