Changeset 70370 in vbox for trunk/src

Timestamp:

Dec 27, 2017 6:36:30 PM (7 years ago)

Author:

vboxsync

Message:

VBVADestroy: Need to check if pHGSMI is NULL _before_ passing it to HGSMIContext, as it won't doing any checking.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp

@@ -2967 +2967 @@
 }
 
-void VBVADestroy (PVGASTATE pVGAState)
-{
-    VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext (pVGAState->pHGSMI);
-
-    if (pCtx)
-    {
+void VBVADestroy(PVGASTATE pVGAState)
+{
+    PHGSMIINSTANCE pHgsmi = pVGAState->pHGSMI;
+    if (pHgsmi)
+    {
+        VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext(pHgsmi);
         pCtx->mouseShapeInfo.fSet = false;
         RTMemFree(pCtx->mouseShapeInfo.pu8Shape);
@@ -2978 +2978 @@
         pCtx->mouseShapeInfo.cbAllocated = 0;
         pCtx->mouseShapeInfo.cbShape = 0;
-    }
-
-    HGSMIDestroy (pVGAState->pHGSMI);
-    pVGAState->pHGSMI = NULL;
-}
+
+        HGSMIDestroy(pHgsmi);
+        pVGAState->pHGSMI = NULL;
+    }
+}
+