Changeset 56748 in vbox

Timestamp:

Jul 2, 2015 11:31:34 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101394

Message:

Storage/VD: Fix three possible memory leaks (unlikely to hit) in case the realloc returns with pTmp \!= g_ahBackendPlugins and friends

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -676 +676 @@
     if (RT_UNLIKELY(!pTmp))
         return VERR_NO_MEMORY;
+    g_apBackends = pTmp;
+
     RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahBackendPlugins,
            (g_cBackends + cBackends) * sizeof(RTLDRMOD));
     if (RT_UNLIKELY(!pTmpPlugins))
         return VERR_NO_MEMORY;
-    g_apBackends = pTmp;
     g_ahBackendPlugins = pTmpPlugins;
     memcpy(&g_apBackends[g_cBackends], ppBackends, cBackends * sizeof(PCVBOXHDDBACKEND));
@@ -706 +707 @@
     if (RT_UNLIKELY(!pTmp))
         return VERR_NO_MEMORY;
+    g_apCacheBackends = pTmp;
+
     RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahCacheBackendPlugins,
            (g_cCacheBackends + cBackends) * sizeof(RTLDRMOD));
     if (RT_UNLIKELY(!pTmpPlugins))
         return VERR_NO_MEMORY;
-    g_apCacheBackends = pTmp;
     g_ahCacheBackendPlugins = pTmpPlugins;
     memcpy(&g_apCacheBackends[g_cCacheBackends], ppBackends, cBackends * sizeof(PCVDCACHEBACKEND));
@@ -741 +743 @@
     if (RT_UNLIKELY(!pTmp))
         return VERR_NO_MEMORY;
+    g_apFilterBackends = pTmp;
+
     RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahFilterBackendPlugins,
            (g_cFilterBackends + cBackends) * sizeof(RTLDRMOD));
     if (RT_UNLIKELY(!pTmpPlugins))
         return VERR_NO_MEMORY;
-    g_apFilterBackends = pTmp;
+
     g_ahFilterBackendPlugins = pTmpPlugins;
     memcpy(&g_apFilterBackends[g_cFilterBackends], ppBackends, cBackends * sizeof(PCVDFILTERBACKEND));