qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PULL v1 11/11] io: fix mem leak in websock error path
Date: Mon, 16 Oct 2017 21:16:50 +0100	[thread overview]
Message-ID: <20171016201650.18399-12-berrange@redhat.com> (raw)
In-Reply-To: <20171016201650.18399-1-berrange@redhat.com>

Coverity pointed out the 'date' is not free()d in the error
path

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 io/channel-websock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/io/channel-websock.c b/io/channel-websock.c
index aa35ef3274..df2c3a9f99 100644
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -341,7 +341,7 @@ static void qio_channel_websock_handshake_send_res_ok(QIOChannelWebsock *ioc,
     char combined_key[QIO_CHANNEL_WEBSOCK_CLIENT_KEY_LEN +
                       QIO_CHANNEL_WEBSOCK_GUID_LEN + 1];
     char *accept = NULL;
-    char *date = qio_channel_websock_date_str();
+    char *date = NULL;
 
     g_strlcpy(combined_key, key, QIO_CHANNEL_WEBSOCK_CLIENT_KEY_LEN + 1);
     g_strlcat(combined_key, QIO_CHANNEL_WEBSOCK_GUID,
@@ -360,6 +360,7 @@ static void qio_channel_websock_handshake_send_res_ok(QIOChannelWebsock *ioc,
         return;
     }
 
+    date = qio_channel_websock_date_str();
     qio_channel_websock_handshake_send_res(
         ioc, QIO_CHANNEL_WEBSOCK_HANDSHAKE_RES_OK, date, accept);
 
-- 
2.13.5

  parent reply	other threads:[~2017-10-16 20:17 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-16 20:16 [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16 Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 01/11] sockets: factor out a new try_bind() function Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 02/11] sockets: factor out create_fast_reuse_socket Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 03/11] sockets: Handle race condition between binds to the same port Daniel P. Berrange
2017-11-03 18:54   ` Peter Maydell
2017-11-06 10:40     ` Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 04/11] io: monitor encoutput buffer size from websocket GSource Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 05/11] io: simplify websocket ping reply handling Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 06/11] io: get rid of qio_channel_websock_encode helper method Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 07/11] io: pass a struct iovec into qio_channel_websock_encode Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 08/11] io: get rid of bounce buffering in websock write path Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 09/11] io: cope with websock 'Connection' header having multiple values Daniel P. Berrange
2017-10-16 20:16 ` [Qemu-devel] [PULL v1 10/11] io: add trace points for websocket HTTP protocol headers Daniel P. Berrange
2017-10-16 20:16 ` Daniel P. Berrange [this message]
2017-10-17 12:12 ` [Qemu-devel] [PULL v1 00/11] Merge QIO 2017-10-16 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171016201650.18399-12-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).