| Message ID | 1453462113-27119-1-git-send-email-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 22, 2016 at 12:28:33PM +0100, Paolo Bonzini wrote: > Just go always through the err label. (Noticed because Coverity > complains that peer is always non-NULL in the error cleanup code, > but removing the "if" is arguably more prone to introducing the > opposite bug in the future). > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel
22.01.2016 14:28, Paolo Bonzini wrote: > Just go always through the err label. (Noticed because Coverity > complains that peer is always non-NULL in the error cleanup code, > but removing the "if" is arguably more prone to introducing the > opposite bug in the future). Applied to -trivial, thanks! /mjt
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index f455a17..a9fed00 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -464,7 +464,7 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, if (err) { error_propagate(errp, err); - return -1; + goto err; } addr = sraddr->host; @@ -474,13 +474,13 @@ static int inet_dgram_saddr(InetSocketAddress *sraddr, } if (port == NULL || strlen(port) == 0) { error_setg(errp, "remote port not specified"); - return -1; + goto err; } if (0 != (rc = getaddrinfo(addr, port, &ai, &peer))) { error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, gai_strerror(rc)); - return -1; + goto err; } /* lookup local addr */
Just go always through the err label. (Noticed because Coverity complains that peer is always non-NULL in the error cleanup code, but removing the "if" is arguably more prone to introducing the opposite bug in the future). Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- util/qemu-sockets.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)