Re: [Qemu-devel] [PATCH] sh4: Fix potential crash in debug code

[Stefan Weil]

Am 13.08.2011 11:25, schrieb Stefan Weil:

Am 20.07.2011 20:56, schrieb Stefan Weil:

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<w...@mail.berlios.de>
---
  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) {

Ping?

Please add the patch to the trivial queue. More than a month time
for review and comments should be sufficient for trivial patches.

Thanks,
Stefan