Changeset 33495 in vbox for trunk/src

Timestamp:

Oct 27, 2010 11:53:50 AM (14 years ago)

Author:

vboxsync

Message:

missing check for NULL after relocation

Location:

trunk/src/VBox

Files:

• Devices/Storage/VBoxHDD.cpp (modified) (2 diffs)
• Devices/Storage/VHDHDDCore.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageMetrics.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -2110 +2110 @@
             RTMemFree(pPluginDirEntry);
             pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
+            if (!pPluginDirEntry)
+            {
+                rc = VERR_NO_MEMORY;
+                break;
+            }
             /* Retry. */
             rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
@@ -2229 +2234 @@
             RTMemFree(pPluginDirEntry);
             pPluginDirEntry = (PRTDIRENTRYEX)RTMemAllocZ(cbPluginDirEntry);
+            if (!pPluginDirEntry)
+            {
+                rc = VERR_NO_MEMORY;
+                break;
+            }
             /* Retry. */
             rc = RTDirReadEx(pPluginDir, pPluginDirEntry, &cbPluginDirEntry, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);

trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp

@@ -520 +520 @@
             /* Update unicode absolute name. */
             pszTmp = (char*)RTMemTmpAllocZ(cbMaxLen);
-            if (!pvBuf)
+            if (!pszTmp)
             {
                 rc = VERR_NO_MEMORY;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp

@@ -45 +45 @@
 {
     char *newList = (char*)RTMemAlloc(strlen(metricList) + 1);
-    int cSlashes = 0;
-    bool fSkip = false;
-    const char *src = metricList;
-    char c, *dst = newList;
-    while ((c = *src++))
-        if (c == ':')
-            fSkip = true;
-        else if (c == '/' && ++cSlashes == 2)
-            fSkip = true;
-        else if (c == ',')
-        {
-            fSkip = false;
-            cSlashes = 0;
-            *dst++ = c;
-        }
-        else
-            if (!fSkip)
+    if (newList)
+    {
+        int cSlashes = 0;
+        bool fSkip = false;
+        const char *src = metricList;
+        char c, *dst = newList;
+        while ((c = *src++))
+            if (c == ':')
+                fSkip = true;
+            else if (c == '/' && ++cSlashes == 2)
+                fSkip = true;
+            else if (c == ',')
+            {
+                fSkip = false;
+                cSlashes = 0;
                 *dst++ = c;
-    *dst = 0;
+            }
+            else
+                if (!fSkip)
+                    *dst++ = c;
+        *dst = 0;
+    }
     return newList;
 }