summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2018-06-08 13:12:25 +0300
committerMax Reitz <mreitz@redhat.com>2018-06-11 16:18:45 +0200
commit7eb24009dbf8102fc27d5459bec1cb8a932540c4 (patch)
tree750cd243c368051ec2029f14482f276ef620f423
parent46e8d272baa0608adcfdbd8bc1d2312bea06da40 (diff)
downloadfocaccia-qemu-7eb24009dbf8102fc27d5459bec1cb8a932540c4.tar.gz
focaccia-qemu-7eb24009dbf8102fc27d5459bec1cb8a932540c4.zip
block/qcow2-bitmap: fix free_bitmap_clusters
This assert may fail, because bitmap_table is not initialized. Just
drop it, as it's obvious, that bitmap_table_load sets bitmap_table
parameter only when returning zero.

Reported-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20180608101225.2575-1-vsementsov@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
-rw-r--r--block/qcow2-bitmap.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 60d5290f10..69485aa1de 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -254,7 +254,6 @@ static int free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb)
 
     ret = bitmap_table_load(bs, tb, &bitmap_table);
     if (ret < 0) {
-        assert(bitmap_table == NULL);
         return ret;
     }