From patchwork Wed Mar 6 21:59:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 225661 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 52B892C0390 for ; Thu, 7 Mar 2013 09:01:42 +1100 (EST) Received: from localhost ([::1]:34280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDMP6-0004Mi-GW for incoming@patchwork.ozlabs.org; Wed, 06 Mar 2013 17:01:40 -0500 Received: from eggs.gnu.org ([208.118.235.92]:54573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDMOa-0004K3-G2 for qemu-devel@nongnu.org; Wed, 06 Mar 2013 17:01:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UDMOX-0004bH-UY for qemu-devel@nongnu.org; Wed, 06 Mar 2013 17:01:08 -0500 Received: from ssl.serverraum.org ([88.198.40.39]:47181) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UDMOX-0004af-OV for qemu-devel@nongnu.org; Wed, 06 Mar 2013 17:01:05 -0500 Received: from localhost (localhost [127.0.0.1]) by ssl.serverraum.org (Postfix) with ESMTP id 205553F054; Wed, 6 Mar 2013 23:00:44 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail.serverraum.org Received: from ssl.serverraum.org ([127.0.0.1]) by localhost (web.serverraum.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WLWB2z-d4SgF; Wed, 6 Mar 2013 23:00:44 +0100 (CET) Received: from thanatos.fritz.box (95-89-88-22-dynip.superkabel.de [95.89.88.22]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id D6F0F3F00A; Wed, 6 Mar 2013 23:00:43 +0100 (CET) From: Michael Walle To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2013 22:59:59 +0100 Message-Id: <1362607209-12232-3-git-send-email-michael@walle.cc> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1362607209-12232-1-git-send-email-michael@walle.cc> References: <1362607209-12232-1-git-send-email-michael@walle.cc> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 88.198.40.39 Cc: Michael Walle Subject: [Qemu-devel] [PATCH 02/12] lm32-dis: fix NULL pointer dereference 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 Walle --- disas/lm32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/disas/lm32.c b/disas/lm32.c index a8eefe0..1718c86 100644 --- a/disas/lm32.c +++ b/disas/lm32.c @@ -303,11 +303,11 @@ int print_insn_lm32(bfd_vma memaddr, struct disassemble_info *info) } case 'c': { uint8_t csr; - const char *csr_name; + const Lm32CsrInfo *info; csr = (op >> 21) & 0x1f; - csr_name = find_csr_info(csr)->name; - if (csr_name) { - fprintf_fn(stream, "%s", csr_name); + info = find_csr_info(csr); + if (info) { + fprintf_fn(stream, "%s", info->name); } else { fprintf_fn(stream, "0x%x", csr); }