Changeset 50276 in vbox for trunk/src/VBox/GuestHost/OpenGL

Timestamp:

Jan 29, 2014 7:36:53 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: proper cleanup, more bugfixes

File:

• trunk/src/VBox/GuestHost/OpenGL/util/htable.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/OpenGL/util/htable.cpp

@@ -101 +101 @@
 static void* crHTablePutToSlot(PCRHTABLE pTbl, uint32_t iSlot, void* pvData)
 {
+    Assert(pvData);
     void* pvOld = pTbl->paData[iSlot];
     pTbl->paData[iSlot] = pvData;
@@ -111 +112 @@
 VBOXHTABLEDECL(int) CrHTablePutToSlot(PCRHTABLE pTbl, CRHTABLE_HANDLE hHandle, void* pvData)
 {
+    if (!pvData)
+    {
+        AssertMsgFailed(("pvData is NULL\n"));
+        return VERR_INVALID_PARAMETER;
+    }
     uint32_t iIndex = crHTableHandle2Index(hHandle);
-    if (iIndex >= pTbl->cData)
+    if (iIndex >= pTbl->cSize)
     {
         int rc = crHTableRealloc(pTbl, iIndex + RT_MAX(10, pTbl->cSize/4));
@@ -129 +135 @@
 VBOXHTABLEDECL(CRHTABLE_HANDLE) CrHTablePut(PCRHTABLE pTbl, void* pvData)
 {
+    if (!pvData)
+    {
+        AssertMsgFailed(("pvData is NULL\n"));
+        return VERR_INVALID_PARAMETER;
+    }
+
     if (pTbl->cSize == pTbl->cData)
     {