From: Pavel Borzenkov <pavel.borzenkov@gmail.com>
Date: Tue, 18 Oct 2011 17:19:03 +0000 (+0400)
Subject: vmdk: vmdk_read_cid returns garbage if p_name is NULL
X-Git-Tag: v1.0-rc0~34^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8379e46d1fd681b8aa4714382e2cdab05e5d0575;p=thirdparty%2Fqemu.git

vmdk: vmdk_read_cid returns garbage if p_name is NULL

Spotted by Clang Analyzer

Signed-off-by: Pavel Borzenkov <pavel.borzenkov@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/block/vmdk.c b/block/vmdk.c
index 396913166a8..a75dcc2b885 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -207,7 +207,7 @@ static void vmdk_free_last_extent(BlockDriverState *bs)
 static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent)
 {
     char desc[DESC_SIZE];
-    uint32_t cid;
+    uint32_t cid = 0xffffffff;
     const char *p_name, *cid_str;
     size_t cid_str_size;
     BDRVVmdkState *s = bs->opaque;