Changeset 90200 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

Jul 14, 2021 11:55:28 PM (4 years ago)

Author:

vboxsync

Message:

DevVGA: Addendum to bugref:9904

File:

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

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

@@ -3857 +3857 @@
      * Get bitmap header data
      */
+    PCLOGOHDR        pLogoHdr = (PCLOGOHDR)pThisCC->pbLogo;
     PBMPFILEHDR      pFileHdr = (PBMPFILEHDR)(pThisCC->pbLogo + sizeof(LOGOHDR));
     PBMPWIN3XINFOHDR pCoreHdr = (PBMPWIN3XINFOHDR)(pThisCC->pbLogo + sizeof(LOGOHDR) + sizeof(BMPFILEHDR));
@@ -3920 +3921 @@
 
         AssertLogRelMsgReturn(pThisCC->LogoCompression == BMP_COMPRESSION_TYPE_NONE,
-                               ("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 const cbFileData  = pFileHdr->cbFileSize - pFileHdr->offBits;
+                              ("Unsupported %u compression.\n", pThisCC->LogoCompression),
+                              VERR_INVALID_PARAMETER);
+
+        AssertLogRelMsgReturn(pLogoHdr->cbLogo > pFileHdr->offBits,
+                              ("Wrong bitmap data offset %u, cbLogo=%u.\n", pFileHdr->offBits, pLogoHdr->cbLogo),
+                              VERR_INVALID_PARAMETER);
+
+        uint32_t const cbFileData  = pLogoHdr->cbLogo - pFileHdr->offBits;
         uint32_t       cbImageData = (uint32_t)pThisCC->cxLogo * pThisCC->cyLogo * pThisCC->cLogoPlanes;
         if (pThisCC->cLogoBits == 4)
@@ -3934 +3935 @@
             cbImageData *= 3;
         AssertLogRelMsgReturn(cbImageData <= cbFileData,
-                              ("Wrong BMP header data %u\n", cbImageData),
+                              ("Wrong BMP header data %u (cbLogo=%u offBits=%u)\n", cbImageData, pFileHdr->offBits, pLogoHdr->cbLogo),
+                              VERR_INVALID_PARAMETER);
+
+        AssertLogRelMsgReturn(pLogoHdr->cbLogo == pFileHdr->cbFileSize,
+                              ("Wrong bitmap file size %u, cbLogo=%u.\n", pFileHdr->cbFileSize, pLogoHdr->cbLogo),
                               VERR_INVALID_PARAMETER);