Changeset 87118 in vbox for trunk

Timestamp:

Dec 24, 2020 10:09:55 AM (4 years ago)

Author:

vboxsync

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

142004

Message:

DevVGA: Removed unused code, better errors messages for bogus custom modes (see bugref:9876).

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (4 diffs)

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

@@ -824 +824 @@
 }
 
-# ifdef SOME_UNUSED_FUNCTION
-/* Calculate line width in pixels based on bit depth and pitch. */
-static uint32_t calc_line_width(uint16_t bpp, uint32_t pitch)
-{
-    uint32_t    width;
-
-    if (bpp <= 4)
-        width = pitch << 1;
-    else
-        width = pitch / ((bpp + 7) >> 3);
-
-    return width;
-}
-# endif
-
 static void recalculate_data(PVGASTATE pThis)
 {
@@ -849 +834 @@
     if (!cbLinePitch)
         cbLinePitch      = calc_line_pitch(cBPP, cX);
-    Assert(cbLinePitch != 0);
+    if (!cbLinePitch)
+        return;
     uint32_t cVirtHeight = pThis->vram_size / cbLinePitch;
     uint16_t offX        = pThis->vbe_regs[VBE_DISPI_INDEX_X_OFFSET];
@@ -6863 +6849 @@
         if (reqSize >= pThis->vram_size)
             continue;
+        if (!reqSize)
+            continue;
         if (   mode_info_list[i].info.XResolution > maxBiosXRes
             || mode_info_list[i].info.YResolution > maxBiosYRes)
@@ -6924 +6912 @@
                 {
                     AssertMsgFailed(("Configuration error: Invalid mode data '%s' for '%s'! cBits=%d\n", pszExtraData, szExtraDataKey, cBits));
+                    return VERR_VGA_INVALID_CUSTOM_MODE;
+                }
+                if (!cx || !cy)
+                {
+                    AssertMsgFailed(("Configuration error: Invalid mode data '%s' for '%s'! cx=%u, cy=%u\n", pszExtraData, szExtraDataKey, cx, cy));
                     return VERR_VGA_INVALID_CUSTOM_MODE;
                 }