From patchwork Mon Feb 8 19:01:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/4] QMP: Don't leak on connection close Date: Mon, 08 Feb 2010 09:01:30 -0000 From: Luiz Capitulino X-Patchwork-Id: 44813 Message-Id: <1265655690-6628-5-git-send-email-lcapitulino@redhat.com> To: qemu-devel@nongnu.org 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 --- 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; } }