Changeset 81194 in vbox

Timestamp:

Oct 9, 2019 7:47:36 PM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics/DevVGA-SVGA.cpp: Improve check, bugref:9535

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -3585 +3585 @@
             STAM_REL_COUNTER_INC(&pSVGAState->StatFifoErrors);
             LogRelMax(8, ("vmsvgaFIFOLoop: Misaligned offCurrentCmd=%#x?\n", offCurrentCmd));
-            offCurrentCmd = ~UINT32_C(3);
+            offCurrentCmd &= ~UINT32_C(3);
         }
 
@@ -4342 +4342 @@
  */
 #  define VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(a_cbMin) \
-     do { AssertMsgBreak(pHdr->size >= (a_cbMin), ("size=%#x a_cbMin=%#zx\n", pHdr->size, (size_t)(a_cbMin))); \
+     if (1) { \
+          AssertMsgBreak(pHdr->size >= (a_cbMin), ("size=%#x a_cbMin=%#zx\n", pHdr->size, (size_t)(a_cbMin))); \
           RT_UNTRUSTED_VALIDATED_FENCE(); \
-     } while (0)
+     } else do {} while (0)
                     switch ((int)enmCmdId)
                     {