Changeset 55623 in vbox

Timestamp:

May 3, 2015 3:33:55 PM (9 years ago)

Author:

vboxsync

Message:

3D: Pack SPU: more carefull with pointers.

File:

• trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c (modified) (4 diffs)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c

@@ -454 +454 @@
     CRASSERT(slot < pack_spu.numContexts);
 
-    context = &(pack_spu.context[slot]);
-
-    if (CRPACKSPU_IS_WDDM_CRHGSMI())
-    {
-        thread = context->currentThread;
-        crPackSetContext(thread->packer);
-        CRASSERT(!(thread->packer == curPacker) == !(thread == curThread));
-    }
-    CRASSERT(thread);
+    context = (slot >= 0 && slot < pack_spu.numContexts) ? &(pack_spu.context[slot]) : NULL;
     curContext = curThread ? curThread->currentContext : NULL;
 
-    if (pack_spu.swap)
-        crPackDestroyContextSWAP( context->serverCtx );
-    else
-        crPackDestroyContext( context->serverCtx );
-
-    crStateDestroyContext( context->clientState );
-
-    context->clientState = NULL;
-    context->serverCtx = 0;
-    context->currentThread = NULL;
-
-    crMemset (&context->zvaBufferInfo, 0, sizeof (context->zvaBufferInfo));
+    if (context)
+    {
+        if (CRPACKSPU_IS_WDDM_CRHGSMI())
+        {
+            thread = context->currentThread;
+            if (thread)
+            {
+                crPackSetContext(thread->packer);
+                CRASSERT(!(thread->packer == curPacker) == !(thread == curThread));
+            }
+        }
+
+        if (pack_spu.swap)
+            crPackDestroyContextSWAP( context->serverCtx );
+        else
+            crPackDestroyContext( context->serverCtx );
+
+        crStateDestroyContext( context->clientState );
+
+        context->clientState = NULL;
+        context->serverCtx = 0;
+        context->currentThread = NULL;
+
+        crMemset (&context->zvaBufferInfo, 0, sizeof (context->zvaBufferInfo));
+    }
 
     if (curContext == context)
@@ -503 +508 @@
 void PACKSPU_APIENTRY packspu_MakeCurrent( GLint window, GLint nativeWindow, GLint ctx )
 {
-    ThreadInfo *thread;
+    ThreadInfo *thread = NULL;
     GLint serverCtx;
-    ContextInfo *newCtx;
+    ContextInfo *newCtx = NULL;
 
     if (!CRPACKSPU_IS_WDDM_CRHGSMI())
@@ -528 +533 @@
 
         newCtx = &pack_spu.context[slot];
+        CRASSERT(newCtx);
         CRASSERT(newCtx->clientState);  /* verify valid */
 
@@ -539 +545 @@
         else
         {
+            CRASSERT(thread);
             if (newCtx->fAutoFlush)
             {