From patchwork Mon Feb 8 19:01:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 44813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 45278B7D1D for ; Tue, 9 Feb 2010 06:06:57 +1100 (EST) Received: from localhost ([127.0.0.1]:35881 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeYwg-0002JE-IC for incoming@patchwork.ozlabs.org; Mon, 08 Feb 2010 14:06:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NeYrk-000108-MA for qemu-devel@nongnu.org; Mon, 08 Feb 2010 14:01:48 -0500 Received: from [199.232.76.173] (port=33464 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NeYrk-0000zu-3b for qemu-devel@nongnu.org; Mon, 08 Feb 2010 14:01:48 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NeYri-0003Cq-Jy for qemu-devel@nongnu.org; Mon, 08 Feb 2010 14:01:47 -0500 Received: from mx20.gnu.org ([199.232.41.8]:4966) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NeYri-0003CC-BZ for qemu-devel@nongnu.org; Mon, 08 Feb 2010 14:01:46 -0500 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NeYrh-0005dK-Kp for qemu-devel@nongnu.org; Mon, 08 Feb 2010 14:01:45 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o18J1iDs014588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 8 Feb 2010 14:01:44 -0500 Received: from localhost (vpn-8-125.rdu.redhat.com [10.11.8.125]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o18J1h5p002278 for ; Mon, 8 Feb 2010 14:01:44 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 8 Feb 2010 17:01:30 -0200 Message-Id: <1265655690-6628-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265655690-6628-1-git-send-email-lcapitulino@redhat.com> References: <1265655690-6628-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH 4/4] QMP: Don't leak on connection close X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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; } }