From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:59924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qjbww-0005z0-6r for qemu-devel@nongnu.org; Wed, 20 Jul 2011 14:56:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qjbws-0004XH-BH for qemu-devel@nongnu.org; Wed, 20 Jul 2011 14:56:49 -0400 From: Stefan Weil Date: Wed, 20 Jul 2011 20:56:35 +0200 Message-Id: <1311188196-2867-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] sh4: Fix potential crash in debug code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org cppcheck reports this error: qemu/hw/sh_intc.c:390: error: Possible null pointer dereference: s - otherwise it is redundant to check if s is null at line 385 If s were NULL, the printf() statement would crash. Setting braces fixes this bug. Signed-off-by: Stefan Weil --- hw/sh_intc.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/sh_intc.c b/hw/sh_intc.c index 0734da9..f73a4b0 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -382,13 +382,14 @@ void sh_intc_register_sources(struct intc_desc *desc, sh_intc_register_source(desc, vect->enum_id, groups, nr_groups); s = sh_intc_source(desc, vect->enum_id); - if (s) - s->vect = vect->vect; + if (s) { + s->vect = vect->vect; #ifdef DEBUG_INTC_SOURCES - printf("sh_intc: registered source %d -> 0x%04x (%d/%d)\n", - vect->enum_id, s->vect, s->enable_count, s->enable_max); + printf("sh_intc: registered source %d -> 0x%04x (%d/%d)\n", + vect->enum_id, s->vect, s->enable_count, s->enable_max); #endif + } } if (groups) { -- 1.7.2.5