Am 17.08.2012 15:23, schrieb Stefan Weil: > ccc-analyzer reports these warnings: > > block/vdi.c:704:13: warning: Dereference of null pointer > bmap[i] = VDI_UNALLOCATED; > ^ > block/vdi.c:702:13: warning: Dereference of null pointer > bmap[i] = i; > ^ > > Moving some code into the if block fixes this. > It also avoids calling function write with 0 bytes of data. > > Signed-off-by: Stefan Weil <s...@weilnetz.de> > --- > block/vdi.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/block/vdi.c b/block/vdi.c > index c4f1529..d80114a 100644 > --- a/block/vdi.c > +++ b/block/vdi.c > @@ -628,7 +628,6 @@ static int vdi_create(const char *filename, > QEMUOptionParameter *options) > VdiHeader header; > size_t i; > size_t bmap_size; > - uint32_t *bmap; > > logout("\n"); > > @@ -693,21 +692,21 @@ static int vdi_create(const char *filename, > QEMUOptionParameter *options) > result = -errno; > } > > - bmap = NULL; > if (bmap_size > 0) { > - bmap = (uint32_t *)g_malloc0(bmap_size); > - } > - for (i = 0; i < blocks; i++) { > - if (image_type == VDI_TYPE_STATIC) { > - bmap[i] = i; > - } else { > - bmap[i] = VDI_UNALLOCATED; > + uint32_t *bmap = (uint32_t *)g_malloc0(bmap_size);
Thanks. Removed the unnecessary cast and applied to block-next. Kevin