From: John Ferlan <jferlan@redhat.com>
Date: Thu, 20 Jul 2017 10:44:21 +0000 (-0400)
Subject: daemon: Don't conditionally free @origErr in daemonStreamEvent
X-Git-Tag: v3.6.0-rc1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b913c8f45303416dd83c284afd50cdb3477cdacf;p=thirdparty%2Flibvirt.git

daemon: Don't conditionally free @origErr in daemonStreamEvent

Commit id '0fe4aa149' added @origErr, but since it's assigned outside
the if condition, the free should be outside as well.

Found by Coverity
---

diff --git a/daemon/stream.c b/daemon/stream.c
index 5077ac8b0a..49682f1145 100644
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -239,7 +239,6 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
         virStreamAbort(stream->st);
         if (origErr && origErr->code != VIR_ERR_OK) {
             virSetError(origErr);
-            virFreeError(origErr);
         } else {
             if (events & VIR_STREAM_EVENT_HANGUP)
                 virReportError(VIR_ERR_RPC,
@@ -248,6 +247,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque)
                 virReportError(VIR_ERR_RPC,
                                "%s", _("stream had I/O failure"));
         }
+        virFreeError(origErr);
 
         msg = virNetMessageNew(false);
         if (!msg) {