Changeset 88545 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Apr 15, 2021 1:59:03 PM (4 years ago)

Author:

vboxsync

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

143825

Message:

Retrieve BMP file header info, bugref:9904

File:

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

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

@@ -3922 +3922 @@
                                ("Unsupported %u compression.\n", pThisCC->LogoCompression),
                                VERR_INVALID_PARAMETER);
+
+        AssertLogRelMsgReturn(pFileHdr->cbFileSize > pFileHdr->offBits,
+                               ("Wrong bitmap data offset %u.\n", pFileHdr->offBits),
+                               VERR_INVALID_PARAMETER);
+
+        uint32_t cbFileData = pFileHdr->cbFileSize - pFileHdr->offBits;
+        uint32_t cbImageData = pThisCC->cxLogo * pThisCC->cyLogo * pThisCC->cLogoPlanes;
+
+        /* TBD: Take 32bit rows padding into account */
+        if (pThisCC->cLogoBits == 4)
+        {
+            cbImageData /= 2;
+        } else if (pThisCC->cLogoBits == 24)
+        {
+            cbImageData *= 3;
+        }
+
+        AssertLogRelMsgReturn(cbImageData <= cbFileData,
+            ("Wrong BMP header data %d\n", cbImageData),
+            VERR_INVALID_PARAMETER);
 
         /*