]> xenbits.xensource.com Git - libvirt.git/commitdiff
Avoid a libvirtd crash on broken input 523418
authorDaniel Veillard <veillard@redhat.com>
Thu, 1 Oct 2009 09:54:38 +0000 (11:54 +0200)
committerDaniel Veillard <veillard@redhat.com>
Thu, 1 Oct 2009 09:54:38 +0000 (11:54 +0200)
* 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.

src/conf/domain_conf.c

index 86da022b36b02b8c88a684c40c4bac01a642f13f..87e05c28fc354f7b0670ce3dcc3fa1f009828b31 100644 (file)
@@ -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);
                 }