Changeset 69968 in vbox

Timestamp:

Dec 7, 2017 10:54:35 AM (7 years ago)

Author:

vboxsync

Message:

VDPlugin: Free g_ahCacheBackendPlugins on shutdown; don't use memcpy to shuffle array members, use memmov.

File:

• trunk/src/VBox/Storage/VDPlugin.cpp (modified) (7 diffs)

trunk/src/VBox/Storage/VDPlugin.cpp

@@ -94 +94 @@
 /** Array of pointers to the cache backends. */
 static PCVDCACHEBACKEND *g_apCacheBackends = NULL;
-/** Array of handles to the corresponding plugin. */
+/** Array of handles to the corresponding plugin.
+ *
+ * @todo r=bird: This looks rather pointless.
+ */
 static RTLDRMOD *g_ahCacheBackendPlugins = NULL;
 /** Builtin cache backends. */
@@ -159 +162 @@
 static int vdAddCacheBackends(RTLDRMOD hPlugin, PCVDCACHEBACKEND *ppBackends, unsigned cBackends)
 {
-    PCVDCACHEBACKEND *pTmp = (PCVDCACHEBACKEND*)RTMemRealloc(g_apCacheBackends,
-           (g_cCacheBackends + cBackends) * sizeof(PCVDCACHEBACKEND));
+    PCVDCACHEBACKEND *pTmp = (PCVDCACHEBACKEND*)RTMemReallocTag(g_apCacheBackends,
+                                                                (g_cCacheBackends + cBackends) * sizeof(PCVDCACHEBACKEND),
+                                                                "may-leak:vdAddCacheBackend");
     if (RT_UNLIKELY(!pTmp))
         return VERR_NO_MEMORY;
     g_apCacheBackends = pTmp;
 
-    RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemRealloc(g_ahCacheBackendPlugins,
-           (g_cCacheBackends + cBackends) * sizeof(RTLDRMOD));
+    RTLDRMOD *pTmpPlugins = (RTLDRMOD*)RTMemReallocTag(g_ahCacheBackendPlugins,
+                                                       (g_cCacheBackends + cBackends) * sizeof(RTLDRMOD),
+                                                       "may-leak:vdAddCacheBackend");
     if (RT_UNLIKELY(!pTmpPlugins))
         return VERR_NO_MEMORY;
@@ -370 +375 @@
         while (i < g_cBackends && g_ahBackendPlugins[i] == pIt->hPlugin)
         {
-            memcpy(&g_apBackends[i], &g_apBackends[i + 1], (g_cBackends - i - 1) * sizeof(PCVDIMAGEBACKEND));
-            memcpy(&g_ahBackendPlugins[i], &g_ahBackendPlugins[i + 1], (g_cBackends - i - 1) * sizeof(RTLDRMOD));
+            memmove(&g_apBackends[i], &g_apBackends[i + 1], (g_cBackends - i - 1) * sizeof(PCVDIMAGEBACKEND));
+            memmove(&g_ahBackendPlugins[i], &g_ahBackendPlugins[i + 1], (g_cBackends - i - 1) * sizeof(RTLDRMOD));
             /** @todo for now skip reallocating, doesn't save much */
             g_cBackends--;
@@ -380 +385 @@
         while (i < g_cCacheBackends && g_ahCacheBackendPlugins[i] == pIt->hPlugin)
         {
-            memcpy(&g_apCacheBackends[i], &g_apCacheBackends[i + 1], (g_cCacheBackends - i - 1) * sizeof(PCVDCACHEBACKEND));
-            memcpy(&g_ahCacheBackendPlugins[i], &g_ahCacheBackendPlugins[i + 1], (g_cCacheBackends - i - 1) * sizeof(RTLDRMOD));
+            memmove(&g_apCacheBackends[i], &g_apCacheBackends[i + 1], (g_cCacheBackends - i - 1) * sizeof(PCVDCACHEBACKEND));
+            memmove(&g_ahCacheBackendPlugins[i], &g_ahCacheBackendPlugins[i + 1], (g_cCacheBackends - i - 1) * sizeof(RTLDRMOD));
             /** @todo for now skip reallocating, doesn't save much */
             g_cCacheBackends--;
@@ -390 +395 @@
         while (i < g_cFilterBackends && g_pahFilterBackendPlugins[i] == pIt->hPlugin)
         {
-            memcpy(&g_apFilterBackends[i], &g_apFilterBackends[i + 1], (g_cFilterBackends - i - 1) * sizeof(PCVDFILTERBACKEND));
-            memcpy(&g_pahFilterBackendPlugins[i], &g_pahFilterBackendPlugins[i + 1], (g_cFilterBackends - i - 1) * sizeof(RTLDRMOD));
+            memmove(&g_apFilterBackends[i], &g_apFilterBackends[i + 1], (g_cFilterBackends - i - 1) * sizeof(PCVDFILTERBACKEND));
+            memmove(&g_pahFilterBackendPlugins[i], &g_pahFilterBackendPlugins[i + 1], (g_cFilterBackends - i - 1) * sizeof(RTLDRMOD));
             /** @todo for now skip reallocating, doesn't save much */
             g_cFilterBackends--;
@@ -870 +875 @@
         return VERR_INTERNAL_ERROR;
 
+    if (g_ahCacheBackendPlugins)
+        RTMemFree(g_ahCacheBackendPlugins);
     if (g_apCacheBackends)
         RTMemFree(g_apCacheBackends);
@@ -880 +887 @@
     g_cCacheBackends = 0;
     g_apCacheBackends = NULL;
+    g_ahCacheBackendPlugins = NULL;
 
 #ifndef VBOX_HDD_NO_DYNAMIC_BACKENDS