Changeset 83513 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 2, 2020 3:29:09 PM (5 years ago)

Author:

vboxsync

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

136820

Message:

VMSVGA: Skip light source if index is wrong, bugref:9689

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -5459 +5459 @@
 
     LogFunc(("vmsvga3dSetLightData cid=%u index=%d type=%d\n", cid, index, pData->type));
+    AssertReturn(index < SVGA3D_MAX_LIGHTS, VERR_INVALID_PARAMETER);
 
     PVMSVGA3DCONTEXT pContext;
@@ -5467 +5468 @@
 
     /* Store for vm state save/restore */
-    if (index < SVGA3D_MAX_LIGHTS)
-    {
-        pContext->state.aLightData[index].fValidData = true;
-        pContext->state.aLightData[index].data = *pData;
-    }
-    else
-        AssertFailed();
+    pContext->state.aLightData[index].fValidData = true;
+    pContext->state.aLightData[index].data = *pData;
 
     if (    pData->attenuation0 < 0.0f

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -4644 +4644 @@
 
     Log(("vmsvga3dSetLightData %x index=%d\n", cid, index));
+    AssertReturn(index < SVGA3D_MAX_LIGHTS, VERR_INVALID_PARAMETER);
 
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
@@ -4669 +4670 @@
 
     /* Store for vm state save/restore */
-    if (index < SVGA3D_MAX_LIGHTS)
-    {
-        pContext->state.aLightData[index].fValidData = true;
-        pContext->state.aLightData[index].data = *pData;
-    }
-    else
-        AssertFailed();
+    pContext->state.aLightData[index].fValidData = true;
+    pContext->state.aLightData[index].data = *pData;
 
     light.Diffuse.r     = pData->diffuse[0];