]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't try to parse a NULL ip address for boot server
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 22 Oct 2010 12:28:04 +0000 (13:28 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Fri, 22 Oct 2010 12:28:04 +0000 (13:28 +0100)
The boot server IP address is optional, so it needs to be
checked before attempting to parse it.

* src/conf/network_conf.c: Don't parse NULL ip address for
  boot server

src/conf/network_conf.c

index d13f9e06c523eb971ffaf1f52da870c66d89b12e..0bc5a5495d073e17e27a7fa077bbc5c1e4039428 100644 (file)
@@ -317,6 +317,7 @@ virNetworkDHCPRangeDefParseXML(virNetworkDefPtr def,
             xmlChar *file;
             xmlChar *server;
             virSocketAddr inaddr;
+            memset(&inaddr, 0, sizeof(inaddr));
 
             if (!(file = xmlGetProp(cur, BAD_CAST "file"))) {
                 cur = cur->next;
@@ -324,7 +325,8 @@ virNetworkDHCPRangeDefParseXML(virNetworkDefPtr def,
             }
             server = xmlGetProp(cur, BAD_CAST "server");
 
-            if (virSocketParseAddr((const char *)server, &inaddr, AF_UNSPEC) < 0)
+            if (server &&
+                virSocketParseAddr((const char *)server, &inaddr, AF_UNSPEC) < 0)
                 return -1;
 
             def->bootfile = (char *)file;