qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 4/4] QMP: Don't leak on connection close
Date: Thu,  4 Feb 2010 18:13:16 -0200	[thread overview]
Message-ID: <1265314396-6583-5-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1265314396-6583-1-git-send-email-lcapitulino@redhat.com>

QMP's chardev event callback doesn't call
json_message_parser_destroy() on CHR_EVENT_CLOSED. As the call
to json_message_parser_init() on CHR_EVENT_OPENED allocates memory,
we'are leaking on close.

Fix that by just calling json_message_parser_destroy() on
CHR_EVENT_CLOSED.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
 monitor.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/monitor.c b/monitor.c
index c8b63aa..aacc0af 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4401,16 +4401,20 @@ static QObject *get_qmp_greeting(void)
  */
 static void monitor_control_event(void *opaque, int event)
 {
-    if (event == CHR_EVENT_OPENED) {
-        QObject *data;
-        Monitor *mon = opaque;
+    QObject *data;
+    Monitor *mon = opaque;
 
+    switch (event) {
+    case CHR_EVENT_OPENED:
         mon->mc->command_mode = 0;
         json_message_parser_init(&mon->mc->parser, handle_qmp_command);
-
         data = get_qmp_greeting();
         monitor_json_emitter(mon, data);
         qobject_decref(data);
+        break;
+    case CHR_EVENT_CLOSED:
+        json_message_parser_destroy(&mon->mc->parser);
+        break;
     }
 }
 
-- 
1.6.6

  parent reply	other threads:[~2010-02-04 20:15 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-04 20:13 [Qemu-devel] [PATCH v0 0/4]: QMP related fixes Luiz Capitulino
2010-02-04 20:13 ` [Qemu-devel] [PATCH 1/4] qjson: Improve debugging Luiz Capitulino
2010-02-04 22:31   ` Anthony Liguori
2010-02-05  9:13     ` Markus Armbruster
2010-02-05 12:13       ` Luiz Capitulino
2010-02-05 12:12     ` Luiz Capitulino
2010-02-05 15:54       ` Anthony Liguori
2010-02-05 17:14         ` Markus Armbruster
2010-02-08 11:22           ` Luiz Capitulino
2010-02-08 14:53           ` Anthony Liguori
2010-02-08 15:05             ` Luiz Capitulino
2010-02-04 20:13 ` [Qemu-devel] [PATCH 2/4] Monitor: remove unneeded checks Luiz Capitulino
2010-02-04 20:13 ` [Qemu-devel] [PATCH 3/4] QError: Don't abort on multiple faults Luiz Capitulino
2010-02-05  9:15   ` Markus Armbruster
2010-02-05 14:21     ` Markus Armbruster
2010-02-05 14:44       ` Luiz Capitulino
2010-02-05 15:15         ` Markus Armbruster
2010-02-05 17:07           ` Luiz Capitulino
2010-02-04 20:13 ` Luiz Capitulino [this message]
  -- strict thread matches above, loose matches on Subject: below --
2010-02-08 19:01 [Qemu-devel] [PATCH v1 0/4]: QMP related fixes Luiz Capitulino
2010-02-08 19:01 ` [Qemu-devel] [PATCH 4/4] QMP: Don't leak on connection close Luiz Capitulino

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=1265314396-6583-5-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --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).