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

Timestamp:

Jan 10, 2025 10:35:52 AM (4 weeks ago)

Author:

vboxsync

Message:

Devices/Graphics/DevVGA_VBVA.cpp: Remove redundant if condition, cbCmd is always >= sizeof(VBVACMDHDR) at this point due to the check before, bugref:3409

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (1 diff)

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

@@ -437 +437 @@
         }
 
-        if (cbCmd != 0)
-        {
-            if (!fUpdate)
-            {
-                pThisCC->pDrv->pfnVBVAUpdateBegin(pThisCC->pDrv, uScreenId);
-                fUpdate = true;
-            }
-
-            /* Updates the rectangle and sends the command to the VRDP server. */
-            pThisCC->pDrv->pfnVBVAUpdateProcess(pThisCC->pDrv, uScreenId, pHdr, cbCmd);
-
-            int32_t xRight  = pHdr->x + pHdr->w;
-            int32_t yBottom = pHdr->y + pHdr->h;
-
-            /* These are global coords, relative to the primary screen. */
-
-            LOGVBVABUFFER(("cbCmd = %d, x=%d, y=%d, w=%d, h=%d\n", cbCmd, pHdr->x, pHdr->y, pHdr->w, pHdr->h));
-            LogRel3(("%s: update command cbCmd = %d, x=%d, y=%d, w=%d, h=%d\n",
-                     __FUNCTION__, cbCmd, pHdr->x, pHdr->y, pHdr->w, pHdr->h));
-
-            /* Collect all rects into one. */
-            if (fDirtyEmpty)
-            {
-                /* This is the first rectangle to be added. */
-                dirtyRect.xLeft   = pHdr->x;
-                dirtyRect.yTop    = pHdr->y;
-                dirtyRect.xRight  = xRight;
+        if (!fUpdate)
+        {
+            pThisCC->pDrv->pfnVBVAUpdateBegin(pThisCC->pDrv, uScreenId);
+            fUpdate = true;
+        }
+
+        /* Updates the rectangle and sends the command to the VRDP server. */
+        pThisCC->pDrv->pfnVBVAUpdateProcess(pThisCC->pDrv, uScreenId, pHdr, cbCmd);
+
+        int32_t xRight  = pHdr->x + pHdr->w;
+        int32_t yBottom = pHdr->y + pHdr->h;
+
+        /* These are global coords, relative to the primary screen. */
+
+        LOGVBVABUFFER(("cbCmd = %d, x=%d, y=%d, w=%d, h=%d\n", cbCmd, pHdr->x, pHdr->y, pHdr->w, pHdr->h));
+        LogRel3(("%s: update command cbCmd = %d, x=%d, y=%d, w=%d, h=%d\n",
+                 __FUNCTION__, cbCmd, pHdr->x, pHdr->y, pHdr->w, pHdr->h));
+
+        /* Collect all rects into one. */
+        if (fDirtyEmpty)
+        {
+            /* This is the first rectangle to be added. */
+            dirtyRect.xLeft   = pHdr->x;
+            dirtyRect.yTop    = pHdr->y;
+            dirtyRect.xRight  = xRight;
+            dirtyRect.yBottom = yBottom;
+            fDirtyEmpty       = false;
+        }
+        else
+        {
+            /* Adjust region coordinates. */
+            if (dirtyRect.xLeft > pHdr->x)
+            {
+                dirtyRect.xLeft = pHdr->x;
+            }
+
+            if (dirtyRect.yTop > pHdr->y)
+            {
+                dirtyRect.yTop = pHdr->y;
+            }
+
+            if (dirtyRect.xRight < xRight)
+            {
+                dirtyRect.xRight = xRight;
+            }
+
+            if (dirtyRect.yBottom < yBottom)
+            {
                 dirtyRect.yBottom = yBottom;
-                fDirtyEmpty       = false;
-            }
-            else
-            {
-                /* Adjust region coordinates. */
-                if (dirtyRect.xLeft > pHdr->x)
-                {
-                    dirtyRect.xLeft = pHdr->x;
-                }
-
-                if (dirtyRect.yTop > pHdr->y)
-                {
-                    dirtyRect.yTop = pHdr->y;
-                }
-
-                if (dirtyRect.xRight < xRight)
-                {
-                    dirtyRect.xRight = xRight;
-                }
-
-                if (dirtyRect.yBottom < yBottom)
-                {
-                    dirtyRect.yBottom = yBottom;
-                }
             }
         }