|
 |
6d3351 |
From 90864415eb0d8e1942bdb879035941909dc0a191 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <90864415eb0d8e1942bdb879035941909dc0a191@dist-git>
|
|
|
6d3351 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
6d3351 |
Date: Tue, 20 Jun 2017 10:22:36 +0200
|
|
|
6d3351 |
Subject: [PATCH] util: storage: Add missing return to
|
|
|
6d3351 |
virStorageSourceParseBackingJSONGluster
|
|
|
6d3351 |
|
|
|
6d3351 |
If the number of servers is not expected the code would report an error
|
|
|
6d3351 |
but would not return failure.
|
|
|
6d3351 |
|
|
|
6d3351 |
(cherry picked from commit 506b80c84e4556296ea7ac499c77b9f4ee87079f)
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1461638
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/util/virstoragefile.c | 2 ++
|
|
|
6d3351 |
1 file changed, 2 insertions(+)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
|
|
|
6d3351 |
index 6427c2b24a..c86cd2fc0a 100644
|
|
|
6d3351 |
--- a/src/util/virstoragefile.c
|
|
|
6d3351 |
+++ b/src/util/virstoragefile.c
|
|
|
6d3351 |
@@ -2893,6 +2893,8 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src,
|
|
|
6d3351 |
virReportError(VIR_ERR_INVALID_ARG, "%s",
|
|
|
6d3351 |
_("at least 1 server is necessary in "
|
|
|
6d3351 |
"JSON backing definition for gluster volume"));
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ return -1;
|
|
|
6d3351 |
}
|
|
|
6d3351 |
|
|
|
6d3351 |
if (VIR_ALLOC_N(src->hosts, nservers) < 0)
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.1
|
|
|
6d3351 |
|