From patchwork Tue Feb 5 16:22:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 218289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A1FFC2C02C5 for ; Wed, 6 Feb 2013 03:22:45 +1100 (EST) Received: from localhost ([::1]:54649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2lIB-0002IZ-DI for incoming@patchwork.ozlabs.org; Tue, 05 Feb 2013 11:22:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:41866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2lHr-0002Hu-Bi for qemu-devel@nongnu.org; Tue, 05 Feb 2013 11:22:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2lHo-0007x9-KC for qemu-devel@nongnu.org; Tue, 05 Feb 2013 11:22:23 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:52221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2lHo-0007wE-CR for qemu-devel@nongnu.org; Tue, 05 Feb 2013 11:22:20 -0500 Received: from blackfin.pond.sub.org (p57B0FFFA.dip.t-dialin.net [87.176.255.250]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 6F3B7A247E; Tue, 5 Feb 2013 17:22:18 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E5EEE200AD; Tue, 5 Feb 2013 17:22:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2013 17:22:07 +0100 Message-Id: <1360081335-6594-5-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1360081335-6594-1-git-send-email-armbru@redhat.com> References: <1360081335-6594-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: lilei@linux.vnet.ibm.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH for-1.4 04/12] qmp: Plug memory leaks in memchar-write, memchar-read X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qemu-char.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qemu-char.c b/qemu-char.c index 892d5bb..9bf53e0 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2782,6 +2782,10 @@ void qmp_memchar_write(const char *device, const char *data, ret = cirmem_chr_write(chr, write_data, write_count); + if (write_data != (uint8_t *)data) { + g_free((void *)write_data); + } + if (ret < 0) { error_setg(errp, "Failed to write to device %s", device); return; @@ -2825,6 +2829,7 @@ char *qmp_memchar_read(const char *device, int64_t size, if (has_format && (format == DATA_FORMAT_BASE64)) { data = g_base64_encode(read_data, count); + g_free(read_data); } else { data = (char *)read_data; }