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

Timestamp:

Nov 21, 2019 7:45:53 AM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics: logrel unknown surface and context ids

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-internal.h

@@ -1226 +1226 @@
 {
     /** @todo stricter checks for associated context */
-    if (   cid >= pState->cContexts
-        || pState->papContexts[cid]->id != cid)
+    AssertReturn(cid < pState->cContexts, VERR_INVALID_PARAMETER);
+    PVMSVGA3DCONTEXT const pContext = pState->papContexts[cid];
+    if (RT_LIKELY(pContext && pContext->id == cid))
     {
-        Log(("vmsvga3dSurfaceCopy invalid context id!\n"));
-        return VERR_INVALID_PARAMETER;
+        *ppContext = pContext;
+        return VINF_SUCCESS;
     }
-
-    *ppContext = pState->papContexts[cid];
-    return VINF_SUCCESS;
+    LogRelMax(64, ("VMSVGA: unknown cid=%d (%s cid=%d)\n", cid, pContext ? "expected" : "null", pContext ? pContext->id : -1));
+    return VERR_INVALID_PARAMETER;
 }
 
 DECLINLINE(int) vmsvga3dSurfaceFromSid(PVMSVGA3DSTATE pState, uint32_t sid, PVMSVGA3DSURFACE *ppSurface)
 {
-    Assert(sid < SVGA3D_MAX_SURFACE_IDS);
     AssertReturn(sid < pState->cSurfaces, VERR_INVALID_PARAMETER);
-    PVMSVGA3DSURFACE pSurface = pState->papSurfaces[sid];
-    AssertReturn(pSurface && pSurface->id == sid, VERR_INVALID_PARAMETER);
-    *ppSurface = pSurface;
-    return VINF_SUCCESS;
+    PVMSVGA3DSURFACE const pSurface = pState->papSurfaces[sid];
+    if (RT_LIKELY(pSurface && pSurface->id == sid))
+    {
+        *ppSurface = pSurface;
+        return VINF_SUCCESS;
+    }
+    LogRelMax(64, ("VMSVGA: unknown sid=%d (%s sid=%d)\n", sid, pSurface ? "expected" : "null", pSurface ? pSurface->id : -1));
+    return VERR_INVALID_PARAMETER;
 }