]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
conf: Don't assign value from ..TypeFromString directly to enum
authorPeter Krempa <pkrempa@redhat.com>
Fri, 19 May 2017 08:25:00 +0000 (10:25 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 19 May 2017 10:16:33 +0000 (12:16 +0200)
Enums are unsigned, so it's impossible to check whether the helper
returned -1 for invalid conversions.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452454

src/conf/domain_conf.c

index 9eba70a950746f4f0cee7fe83296dc0dec611fb5..8c626733985ed6b3b18c8f61d0c8e24e1b5eaa33 100644 (file)
@@ -14083,6 +14083,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode,
     xmlNodePtr save = ctxt->node;
     xmlNodePtr node;
     virDomainMemoryDefPtr def;
+    int val;
 
     ctxt->node = memdevNode;
 
@@ -14102,12 +14103,14 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode,
     }
     VIR_FREE(tmp);
 
-    tmp = virXMLPropString(memdevNode, "access");
-    if (tmp &&
-        (def->access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("invalid access mode '%s'"), tmp);
-        goto error;
+    if ((tmp = virXMLPropString(memdevNode, "access"))) {
+        if ((val = virDomainMemoryAccessTypeFromString(tmp)) <= 0) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("invalid access mode '%s'"), tmp);
+            goto error;
+        }
+
+        def->access = val;
     }
     VIR_FREE(tmp);