From: John Ferlan <jferlan@redhat.com>
Date: Fri, 9 Jan 2015 15:48:37 +0000 (-0500)
Subject: openvz: Check errors from virSocketAddrFormat
X-Git-Tag: v1.2.12-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a267f0153231983d767f7019e2ef7e7dfe6c8a97;p=thirdparty%2Flibvirt.git

openvz: Check errors from virSocketAddrFormat

Commit id 'a4e86390' modified the command line to allow --ipadd multiple
times; however, it did not account for the condition where a NULL is
returned which will could lead to some interesting errors with multiple
--ipadd's without parameters.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 64f5219fd9..17919bea67 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -910,6 +910,8 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
         /* --ipadd ip */
         for (i = 0; i < net->nips; i++) {
             char *ipStr = virSocketAddrFormat(&net->ips[i]->address);
+            if (!ipStr)
+                goto cleanup;
             virCommandAddArgList(cmd, "--ipadd", ipStr, NULL);
             VIR_FREE(ipStr);
         }