Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-11' into...

[mirror_qemu.git] / block / bochs.c

diff --git a/block/bochs.c b/block/bochs.c
index eba23df33537f4740cc1aafae8cba1505dc6ea5e..199ac2b9af7ba4b61a64b4171c2700fadf0f71cc 100644 (file)
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -131,7 +131,11 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
         return -EFBIG;
     }
 
-    s->catalog_bitmap = g_malloc(s->catalog_size * 4);
+    s->catalog_bitmap = g_try_new(uint32_t, s->catalog_size);
+    if (s->catalog_size && s->catalog_bitmap == NULL) {
+        error_setg(errp, "Could not allocate memory for catalog");
+        return -ENOMEM;
+    }
 
     ret = bdrv_pread(bs->file, le32_to_cpu(bochs.header), s->catalog_bitmap,
                      s->catalog_size * 4);