]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Don't check validity of missing attributes in DNS SRV XML
authorJán Tomko <jtomko@redhat.com>
Fri, 26 Jul 2013 10:11:21 +0000 (12:11 +0200)
committerJán Tomko <jtomko@redhat.com>
Thu, 1 Aug 2013 14:58:57 +0000 (16:58 +0200)
This fixes a crash if one of them is missing.

https://bugzilla.redhat.com/show_bug.cgi?id=988718
(cherry picked from commit 461fd86a661f32a9aa8044190b2a63b05290332f)

src/conf/network_conf.c

index 2b4845ca995054d2e2856b0af47a08c32ebb6874..c909756f7904701dcbd6c897834ee7b6bdbc1bb8 100644 (file)
@@ -931,7 +931,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName,
                          " of network %s"), networkName);
         goto error;
     }
-    if (strlen(def->service) > DNS_RECORD_LENGTH_SRV) {
+    if (def->service && strlen(def->service) > DNS_RECORD_LENGTH_SRV) {
         virReportError(VIR_ERR_XML_DETAIL,
                        _("Service name '%s' in network %s is too long, limit is %d bytes"),
                        def->service, networkName, DNS_RECORD_LENGTH_SRV);
@@ -947,7 +947,8 @@ virNetworkDNSSrvDefParseXML(const char *networkName,
     }
 
     /* Check whether protocol value is the supported one */
-    if (STRNEQ(def->protocol, "tcp") && (STRNEQ(def->protocol, "udp"))) {
+    if (def->protocol && STRNEQ(def->protocol, "tcp") &&
+        (STRNEQ(def->protocol, "udp"))) {
         virReportError(VIR_ERR_XML_DETAIL,
                        _("Invalid protocol attribute value '%s' "
                          " in DNS SRV record of network %s"),