Changeset 62794 in vbox for trunk/src/VBox

Timestamp:

Aug 1, 2016 8:09:40 AM (8 years ago)

Author:

vboxsync

Message:

Storage/VHD: Fix todo about uninitialized variable

File:

• trunk/src/VBox/Storage/VHD.cpp (modified) (4 diffs)

trunk/src/VBox/Storage/VHD.cpp

@@ -305 +305 @@
 {
     int      rc = VINF_SUCCESS;
-    uint32_t cb, cbMaxLen = RT_BE2H_U32(pLocator->u32DataSpace); /* ugly. initialized variable on separate lines, please. */
+    uint32_t cb = 0;
+    uint32_t cbMaxLen = RT_BE2H_U32(pLocator->u32DataSpace);
     void     *pvBuf = RTMemTmpAllocZ(cbMaxLen);
     char     *pszTmp;
@@ -333 +334 @@
                     memcpy(pvBuf, szPath, cb);
                 }
-                else
-                    cb = 0; /* (Shut up MSC) */
             }
             else
@@ -355 +354 @@
             rc = RTPathAbs(pszFilename, (char *)pvBuf, cbMaxLen);
             if (RT_SUCCESS(rc))
-                pLocator->u32DataLength = RT_H2BE_U32((uint32_t)strlen((const char *)pvBuf));
+            {
+                cb = (uint32_t)strlen((const char *)pvBuf);
+                pLocator->u32DataLength = RT_H2BE_U32(cb);
+            }
             break;
         case VHD_PLATFORM_CODE_W2RU:
@@ -401 +403 @@
 
     if (RT_SUCCESS(rc))
+    {
+        Assert(cb > 0);
         rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage,
                                     RT_BE2H_U64(pLocator->u64DataOffset),
-                                    pvBuf, cb); /** @todo r=msc: 'cb' _IS_ used uninitialized in the VHD_PLATFORM_CODE_WI2K path! */
+                                    pvBuf, cb);
+    }
 
     if (pvBuf)