From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 1 Oct 2009 09:54:38 +0000 (+0200)
Subject: Avoid a libvirtd crash on broken input 523418
X-Git-Tag: v0.7.2~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79d233b5ca62f86ab22d271d1f08ec20060eee88;p=thirdparty%2Flibvirt.git

Avoid a libvirtd crash on broken input 523418

* src/conf/domain_conf.c: a simple typo in an XML domain file could lead
  to a crash, because we called STRPREFIX() on the looked up value without
  checking it was non-null.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 86da022b36..87e05c28fc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1032,7 +1032,8 @@ virDomainNetDefParseXML(virConnectPtr conn,
             } else if ((ifname == NULL) &&
                        xmlStrEqual(cur->name, BAD_CAST "target")) {
                 ifname = virXMLPropString(cur, "dev");
-                if (STRPREFIX((const char*)ifname, "vnet")) {
+                if ((ifname != NULL) &&
+                    (STRPREFIX((const char*)ifname, "vnet"))) {
                     /* An auto-generated target name, blank it out */
                     VIR_FREE(ifname);
                 }