[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/4] Don't check validity of missing attributes in DNS SRV XML



This fixes a crash if one of them is missing.

https://bugzilla.redhat.com/show_bug.cgi?id=988718
---
 src/conf/network_conf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index e3e0e89..5faac92 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -923,7 +923,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);
@@ -939,7 +939,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"),
-- 
1.8.1.5


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]