Changeset 34674 in vbox

Timestamp:

Dec 3, 2010 12:57:15 AM (14 years ago)

Author:

vboxsync

Message:

Devices/Graphics: r68469, fixed

File:

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

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

@@ -1797 +1797 @@
 
             VBVAINFOSCREEN *pScreen = (VBVAINFOSCREEN *)pvBuffer;
-            int64_t cLastX = (int64_t)pScreen->u32Width + pScreen->i32OriginX;
-            int64_t cLastY = (int64_t)pScreen->u32Height + pScreen->i32OriginY;
             VBVAINFOVIEW *pView = &pCtx->aViews[pScreen->u32ViewIndex].view;
-            /* Calculate the offsets of the beginning and the end of the screen
-             * so we can make sure they are inside the view.  We assume that
-             * screen rollover is not implemented. */
-            int64_t offBegin =   pScreen->i32OriginY * pScreen->u32LineSize
-                               +   pScreen->i32OriginX
-                                 * pScreen->u16BitsPerPixel / 8;
-            int64_t offEnd   =   cLastY * pScreen->u32LineSize
-                               + cLastX * pScreen->u16BitsPerPixel / 8;
+            /* Calculate the offset of the  end of the screen so we can make
+             * sure it is inside the view.  I assume that screen rollover is not
+             * implemented. */
+            int64_t offEnd =   (int64_t)pScreen->u32Height * pScreen->u32LineSize
+                             + pScreen->u32Width + pScreen->u32StartOffset;
             LogFlowFunc(("VBVA_INFO_SCREEN: [%d] @%d,%d %dx%d, line 0x%x, BPP %d, flags 0x%x\n",
                          pScreen->u32ViewIndex, pScreen->i32OriginX, pScreen->i32OriginY,
@@ -1815 +1810 @@
             if (   pScreen->u32ViewIndex < RT_ELEMENTS (pCtx->aViews)
                 && pScreen->u16BitsPerPixel <= 32
-                && offBegin >= 0
+                && pScreen->u32Width <= UINT16_MAX
+                && pScreen->u32Height <= UINT16_MAX
+                && pScreen->u32LineSize <= UINT16_MAX * 4
                 && offEnd < pView->u32MaxScreenSize)
             {
@@ -1822 +1819 @@
             else
             {
-                Log(("VBVA_INFO_SCREEN [%lu]: bad data: @%ld,%ld %lux%lu, line 0x%lx, BPP %u, max screen size %lu\n",
+                Log(("VBVA_INFO_SCREEN [%lu]: bad data: %lux%lu, line 0x%lx, BPP %u, start offset %lu, max screen size %lu\n",
                          (unsigned long)pScreen->u32ViewIndex,
-                         (long)pScreen->i32OriginX,
-                         (long)pScreen->i32OriginY,
                          (unsigned long)pScreen->u32Width,
                          (unsigned long)pScreen->u32Height,
                          (unsigned long)pScreen->u32LineSize,
                          (unsigned long)pScreen->u16BitsPerPixel,
+                         (unsigned long)pScreen->u32StartOffset,
                          (unsigned long)pView->u32MaxScreenSize));
                 rc = VERR_INVALID_PARAMETER;