From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 29 Nov 2012 10:46:00 +0000 (+0100)
Subject: virsh: do timing even for unusable connections
X-Git-Tag: CVE-2012-3411~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b235d40576d5b5077a4ab2ee52a1897211f5e4d;p=thirdparty%2Flibvirt.git

virsh: do timing even for unusable connections

Time values were uninitialized if the connection wasn't usable.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 63721770e4..dea3f82493 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -1562,20 +1562,20 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd)
             !(cmd->def->flags & VSH_CMD_FLAG_NOCONNECT))
             vshReconnect(ctl);
 
+        if (enable_timing)
+            GETTIMEOFDAY(&before);
+
         if ((cmd->def->flags & VSH_CMD_FLAG_NOCONNECT) ||
             vshConnectionUsability(ctl, ctl->conn)) {
-            if (enable_timing)
-                GETTIMEOFDAY(&before);
-
             ret = cmd->def->handler(ctl, cmd);
-
-            if (enable_timing)
-                GETTIMEOFDAY(&after);
         } else {
             /* connection is not usable, return error */
             ret = false;
         }
 
+        if (enable_timing)
+            GETTIMEOFDAY(&after);
+
         /* try to automatically catch disconnections */
         if (!ret &&
             ((last_error != NULL) &&