From patchwork Sat May 30 13:54:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 478444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F3E05140F91 for ; Sat, 30 May 2015 23:55:06 +1000 (AEST) Received: from localhost ([::1]:39550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyhE8-0000uW-8S for incoming@patchwork.ozlabs.org; Sat, 30 May 2015 09:55:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyhDs-0000Yw-TL for qemu-devel@nongnu.org; Sat, 30 May 2015 09:54:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyhDp-0006SE-Nm for qemu-devel@nongnu.org; Sat, 30 May 2015 09:54:48 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:56951) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyhDp-0006SA-GW; Sat, 30 May 2015 09:54:45 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 92D5742A03; Sat, 30 May 2015 16:54:44 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id 84F7793A; Sat, 30 May 2015 16:54:44 +0300 (MSK) Received: (nullmailer pid 5719 invoked by uid 1000); Sat, 30 May 2015 13:54:44 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sat, 30 May 2015 16:54:43 +0300 Message-Id: <1432994083-5677-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Cc: qemu-trivial@nongnu.org, Michael Tokarev , Shannon Zhao Subject: [Qemu-devel] [PATCH 2/2] hw/display/tcx.c: tcx_realizefn: fix memory leak, make FCode loading error fatal and improve error message 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: Michael Tokarev Reviewed-by: Shannon Zhao --- hw/display/tcx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/display/tcx.c b/hw/display/tcx.c index a9f9f66..c2b32c3 100644 --- a/hw/display/tcx.c +++ b/hw/display/tcx.c @@ -1014,10 +1014,13 @@ static void tcx_realizefn(DeviceState *dev, Error **errp) if (fcode_filename) { ret = load_image_targphys(fcode_filename, s->prom_addr, FCODE_MAX_ROM_SIZE); - if (ret < 0 || ret > FCODE_MAX_ROM_SIZE) { - error_report("tcx: could not load prom '%s'", TCX_ROM_FILE); - } } + if (!fcode_filename || ret < 0 || ret > FCODE_MAX_ROM_SIZE) { + error_report("tcx: could not load prom '%s'", + fcode_filename ? fcode_filename : TCX_ROM_FILE); + exit(1); + } + g_free(fcode_filename); /* 0/DFB8 : 8-bit plane */ s->vram = vram_base;