From patchwork Wed Jul 7 18:57:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Chary X-Patchwork-Id: 58155 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 E6D52B6F05 for ; Thu, 8 Jul 2010 05:21:29 +1000 (EST) Received: from localhost ([127.0.0.1]:36877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWaAv-0003v6-46 for incoming@patchwork.ozlabs.org; Wed, 07 Jul 2010 15:20:53 -0400 Received: from [140.186.70.92] (port=34936 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWZoe-00086c-Ei for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWZoc-0002fj-3R for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:52 -0400 Received: from iksaif.net ([88.191.73.63]:35191) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWZob-0002eq-U3 for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:50 -0400 Received: from falgoret.iksaif.net (localhost [127.0.0.1]) (Authenticated sender: corentincj@iksaif.net) by iksaif.net (Postfix) with ESMTPA id 77FFCC90076; Wed, 7 Jul 2010 20:58:14 +0200 (CEST) From: Corentin Chary To: qemu-devel@nongnu.org Date: Wed, 7 Jul 2010 20:57:55 +0200 Message-Id: <1278529086-10391-8-git-send-email-corentincj@iksaif.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1278529086-10391-1-git-send-email-corentincj@iksaif.net> References: <1278529086-10391-1-git-send-email-corentincj@iksaif.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Corentin Chary , Anthony Liguori , Alexander Graf Subject: [Qemu-devel] [PATCH v2 07/18] vnc: tight: remove a memleak in send_jpeg_rect() 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 buf was never freed. Signed-off-by: Corentin Chary --- ui/vnc-enc-tight.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index ade8e5f..4ff88a8 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -1247,8 +1247,6 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality) if (ds_get_bytes_per_pixel(vs->ds) == 1) return send_full_color_rect(vs, w, h); - buf = qemu_malloc(w * 3); - row[0] = buf; buffer_reserve(&vs->tight_jpeg, 2048); cinfo.err = jpeg_std_error(&jerr); @@ -1270,10 +1268,13 @@ static int send_jpeg_rect(VncState *vs, int x, int y, int w, int h, int quality) jpeg_start_compress(&cinfo, true); + buf = qemu_malloc(w * 3); + row[0] = buf; for (dy = 0; dy < h; dy++) { jpeg_prepare_row(vs, buf, x, y + dy, w); jpeg_write_scanlines(&cinfo, row, 1); } + qemu_free(buf); jpeg_finish_compress(&cinfo); jpeg_destroy_compress(&cinfo);