From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 18 Mar 2014 10:04:27 +0000 (+0100)
Subject: virNetServerNewPostExecRestart: Initialize @max_anonymous_clients
X-Git-Tag: v1.2.3-rc1~174
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a8d91d922cea30f87165b01d524af1d4ddf8da1;p=thirdparty%2Flibvirt.git

virNetServerNewPostExecRestart: Initialize @max_anonymous_clients

Coverity spotted a use of possibly undefined variable. If a server is
restarting as an result of update, the JSON file that keeps current
value of some variables will not contain the new variables. This is
the case of @max_anonymous_clients too. We are correctly querying if
there's "max_anonymous_clients" in the JSON, however, we are not
setting a sane default if there's none.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index dfa3565924..33a0346cb5 100644
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -494,12 +494,15 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object,
                        _("Missing max_clients data in JSON document"));
         goto error;
     }
-    if (virJSONValueObjectHasKey(object, "max_anonymous_clients") &&
-        virJSONValueObjectGetNumberUint(object, "max_anonymous_clients",
-                                        &max_anonymous_clients) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Malformed max_anonymous_clients data in JSON document"));
-        goto error;
+    if (virJSONValueObjectHasKey(object, "max_anonymous_clients")) {
+        if (virJSONValueObjectGetNumberUint(object, "max_anonymous_clients",
+                                            &max_anonymous_clients) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("Malformed max_anonymous_clients data in JSON document"));
+            goto error;
+        }
+    } else {
+        max_anonymous_clients = max_clients;
     }
     if (virJSONValueObjectGetNumberUint(object, "keepaliveInterval", &keepaliveInterval) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",