Patchwork pci: Remove unneeded null pointer check

login
register
mail settings
Submitter Stefan Weil
Date Jan. 15, 2011, 6:01 p.m.
Message ID <1295114463-13806-1-git-send-email-weil@mail.berlios.de>
Download mbox | patch
Permalink /patch/79060/
State Accepted
Headers show

Comments

Stefan Weil - Jan. 15, 2011, 6:01 p.m.
With bm == NULL, other code in the same function would crash.

This bug was reported by cppcheck:
hw/ide/pci.c:280: error: Possible null pointer dereference: bm

Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 hw/ide/pci.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
Michael S. Tsirkin - Jan. 15, 2011, 6:11 p.m.
On Sat, Jan 15, 2011 at 07:01:03PM +0100, Stefan Weil wrote:
> With bm == NULL, other code in the same function would crash.
> 
> This bug was reported by cppcheck:
> hw/ide/pci.c:280: error: Possible null pointer dereference: bm
> 
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Looks sane. Kevin?

> ---
>  hw/ide/pci.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ide/pci.c b/hw/ide/pci.c
> index 510b2de..f0db4f2 100644
> --- a/hw/ide/pci.c
> +++ b/hw/ide/pci.c
> @@ -272,9 +272,7 @@ static void bmdma_irq(void *opaque, int n, int level)
>          return;
>      }
>  
> -    if (bm) {
> -        bm->status |= BM_STATUS_INT;
> -    }
> +    bm->status |= BM_STATUS_INT;
>  
>      /* trigger the real irq */
>      qemu_set_irq(bm->irq, level);
> -- 
> 1.7.2.3
Kevin Wolf - Jan. 17, 2011, 9:43 a.m.
Am 15.01.2011 19:01, schrieb Stefan Weil:
> With bm == NULL, other code in the same function would crash.
> 
> This bug was reported by cppcheck:
> hw/ide/pci.c:280: error: Possible null pointer dereference: bm
> 
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>

Thanks, applied to the block branch.

Kevin

Patch

diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 510b2de..f0db4f2 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -272,9 +272,7 @@  static void bmdma_irq(void *opaque, int n, int level)
         return;
     }
 
-    if (bm) {
-        bm->status |= BM_STATUS_INT;
-    }
+    bm->status |= BM_STATUS_INT;
 
     /* trigger the real irq */
     qemu_set_irq(bm->irq, level);