|
 |
3e5111 |
From 8c00ca78eed4ffdb9238b89b58eb5975baf5e339 Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <8c00ca78eed4ffdb9238b89b58eb5975baf5e339@dist-git>
|
|
|
3e5111 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
3e5111 |
Date: Fri, 19 May 2017 12:24:11 +0200
|
|
|
3e5111 |
Subject: [PATCH] conf: Don't assign value from ..TypeFromString directly to
|
|
|
3e5111 |
enum
|
|
|
3e5111 |
|
|
|
3e5111 |
Enums are unsigned, so it's impossible to check whether the helper
|
|
|
3e5111 |
returned -1 for invalid conversions.
|
|
|
3e5111 |
|
|
|
3e5111 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452454
|
|
|
3e5111 |
(cherry picked from commit 85d62624c5d02c38e00a275dc2b2957584454908)
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
src/conf/domain_conf.c | 15 +++++++++------
|
|
|
3e5111 |
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
3e5111 |
index 1653aa61d..a918ecd59 100644
|
|
|
3e5111 |
--- a/src/conf/domain_conf.c
|
|
|
3e5111 |
+++ b/src/conf/domain_conf.c
|
|
|
3e5111 |
@@ -14065,6 +14065,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode,
|
|
|
3e5111 |
xmlNodePtr save = ctxt->node;
|
|
|
3e5111 |
xmlNodePtr node;
|
|
|
3e5111 |
virDomainMemoryDefPtr def;
|
|
|
3e5111 |
+ int val;
|
|
|
3e5111 |
|
|
|
3e5111 |
ctxt->node = memdevNode;
|
|
|
3e5111 |
|
|
|
3e5111 |
@@ -14084,12 +14085,14 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode,
|
|
|
3e5111 |
}
|
|
|
3e5111 |
VIR_FREE(tmp);
|
|
|
3e5111 |
|
|
|
3e5111 |
- tmp = virXMLPropString(memdevNode, "access");
|
|
|
3e5111 |
- if (tmp &&
|
|
|
3e5111 |
- (def->access = virDomainMemoryAccessTypeFromString(tmp)) <= 0) {
|
|
|
3e5111 |
- virReportError(VIR_ERR_XML_ERROR,
|
|
|
3e5111 |
- _("invalid access mode '%s'"), tmp);
|
|
|
3e5111 |
- goto error;
|
|
|
3e5111 |
+ if ((tmp = virXMLPropString(memdevNode, "access"))) {
|
|
|
3e5111 |
+ if ((val = virDomainMemoryAccessTypeFromString(tmp)) <= 0) {
|
|
|
3e5111 |
+ virReportError(VIR_ERR_XML_ERROR,
|
|
|
3e5111 |
+ _("invalid access mode '%s'"), tmp);
|
|
|
3e5111 |
+ goto error;
|
|
|
3e5111 |
+ }
|
|
|
3e5111 |
+
|
|
|
3e5111 |
+ def->access = val;
|
|
|
3e5111 |
}
|
|
|
3e5111 |
VIR_FREE(tmp);
|
|
|
3e5111 |
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.13.0
|
|
|
3e5111 |
|