Changeset 28412 in vbox for trunk/src/VBox

Timestamp:

Apr 16, 2010 12:49:03 PM (15 years ago)

Author:

vboxsync

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

60176

Message:

LsiLogic: Fix memory leak

File:

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

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

@@ -578 +578 @@
     PDMCritSectLeave(&pLsiLogic->ReplyPostQueueCritSect);
 }
+
+static void lsilogicTaskStateClear(PLSILOGICTASKSTATE pTaskState)
+{
+    RTMemFree(pTaskState->pSGListHead);
+    RTMemFree(pTaskState->paSGEntries);
+    if (pTaskState->pvBufferUnaligned)
+        RTMemPageFree(pTaskState->pvBufferUnaligned, pTaskState->cbBufferUnaligned);
+    pTaskState->cSGListSize = 0;
+    pTaskState->cSGInfoSize = 0;
+    pTaskState->cSGInfoEntries = 0;
+    pTaskState->cSGListTooBig  = 0;
+    pTaskState->pSGListHead = NULL;
+    pTaskState->paSGEntries = NULL;
+    pTaskState->pvBufferUnaligned = NULL;
+    pTaskState->cbBufferUnaligned = 0;
+}
+
+static int lsilogicTaskStateCtor(RTMEMCACHE hMemCache, void *pvObj, void *pvUser)
+{
+    memset(pvObj, 0, sizeof(LSILOGICTASKSTATE));
+    return VINF_SUCCESS;
+}
+
+static void lsilogicTaskStateDtor(RTMEMCACHE hMemCache, void *pvObj, void *pvUser)
+{
+    PLSILOGICTASKSTATE pTaskState = (PLSILOGICTASKSTATE)pvObj;
+    lsilogicTaskStateClear(pTaskState);
+}
+
 #endif /* IN_RING3 */
 
@@ -1483 +1512 @@
     /* Free allocated memory if the list was too big too many times. */
     if (pTaskState->cSGListTooBig >= LSILOGIC_NR_OF_ALLOWED_BIGGER_LISTS)
-    {
-        RTMemFree(pTaskState->pSGListHead);
-        RTMemFree(pTaskState->paSGEntries);
-        if (pTaskState->pvBufferUnaligned)
-            RTMemPageFree(pTaskState->pvBufferUnaligned, pTaskState->cbBufferUnaligned);
-        pTaskState->cSGListSize = 0;
-        pTaskState->cSGInfoSize = 0;
-        pTaskState->cSGInfoEntries = 0;
-        pTaskState->cSGListTooBig  = 0;
-        pTaskState->pSGListHead = NULL;
-        pTaskState->paSGEntries = NULL;
-        pTaskState->pvBufferUnaligned = NULL;
-        pTaskState->cbBufferUnaligned = 0;
-    }
+        lsilogicTaskStateClear(pTaskState);
 }
 
@@ -4555 +4571 @@
      */
     rc = RTMemCacheCreate(&pThis->hTaskCache, sizeof(LSILOGICTASKSTATE), 0, UINT32_MAX,
-                          NULL, NULL, NULL, 0);
+                          lsilogicTaskStateCtor, lsilogicTaskStateDtor, NULL, 0);
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,