Changeset 59609 in vbox

Timestamp:

Feb 8, 2016 8:56:14 PM (9 years ago)

Author:

vboxsync

Message:

VMDK.cpp: Corrected incorrect free. Drop const on temporary strings which needs freeing. Forgot a free in an out-of-memory path. Critiqued vmdkAllocGrainDirectory.

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (9 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -1022 +1022 @@
     int rc = VINF_SUCCESS;
     size_t cbGD = pExtent->cGDEntries * sizeof(uint32_t);
+    /** @todo r=bird: This code is unnecessarily confusing pointer states with
+     *        (1) unnecessary initialization of locals, (2) unnecesarily wide
+     *        scoping of variables, (3) instance on goto code structure.  Also,
+     *        having two initialized variables on one line decreases readability. */
     uint32_t *pGD = NULL, *pRGD = NULL;
 
@@ -1365 +1369 @@
 }
 
+/**
+ * @param   ppszUnquoted    Where to store the return value, use RTMemTmpFree to
+ *                          free.
+ */
 static int vmdkStringUnquote(PVMDKIMAGE pImage, const char *pszStr,
                              char **ppszUnquoted, char **ppszNext)
@@ -1568 +1576 @@
 }
 
+/**
+ * @param   ppszValue       Where to store the return value, use RTMemTmpFree to
+ *                          free.
+ */
 static int vmdkDescBaseGetStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
-                              const char *pszKey, const char **ppszValue)
+                              const char *pszKey, char **ppszValue)
 {
     const char *pszValue;
@@ -1701 +1713 @@
 }
 
+/**
+ * @param   ppszValue       Where to store the return value, use RTMemTmpFree to
+ *                          free.
+ */
 static int vmdkDescDDBGetStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
-                             const char *pszKey, const char **ppszValue)
+                             const char *pszKey, char **ppszValue)
 {
     const char *pszValue;
@@ -2049 +2065 @@
 
     /* Get image creation type and determine image flags. */
-    const char *pszCreateType = NULL;   /* initialized to make gcc shut up */
+    char *pszCreateType = NULL;   /* initialized to make gcc shut up */
     rc = vmdkDescBaseGetStr(pImage, &pImage->Descriptor, "createType",
                             &pszCreateType);
@@ -2064 +2080 @@
     else if (!strcmp(pszCreateType, "vmfs"))
         pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_ESX;
-    RTStrFree((char *)(void *)pszCreateType);
+    RTMemTmpFree(pszCreateType);
 
     /* Count the number of extent config entries. */
@@ -3670 +3686 @@
             char *pszBasename = (char *)RTMemTmpAlloc(cbTmp);
             if (!pszBasename)
+            {
+                RTStrFree(pszTmp);
                 return VERR_NO_MEMORY;
+            }
             memcpy(pszBasename, pszTmp, cbTmp);
             RTStrFree(pszTmp);
@@ -6243 +6262 @@
     if (pImage)
     {
-        const char *pszCommentEncoded = NULL;
+        char *pszCommentEncoded = NULL;
         rc = vmdkDescDDBGetStr(pImage, &pImage->Descriptor,
                               "ddb.comment", &pszCommentEncoded);
@@ -6259 +6278 @@
             rc = VINF_SUCCESS;
         }
-        if (pszCommentEncoded)
-            RTStrFree((char *)(void *)pszCommentEncoded);
+        RTMemTmpFree(pszCommentEncoded);
     }
     else