Changeset 90021 in vbox

Timestamp:

Jul 5, 2021 8:59:14 AM (3 years ago)

Author:

vboxsync

Message:

DevVGA: Fixed regression from r112425, must use RT_MAX to determin logo alloc size. bugref:9904

File:

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

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

@@ -7129 +7129 @@
     pThisCC->cbLogo = LogoHdr.cbLogo;
     if (g_cbVgaDefBiosLogo)
-        pThisCC->cbLogo = g_cbVgaDefBiosLogo;
+        pThisCC->cbLogo = RT_MAX(pThisCC->cbLogo, g_cbVgaDefBiosLogo);
 # ifndef VBOX_OSE
     if (g_cbVgaDefBiosLogoNY)
-        pThisCC->cbLogo = g_cbVgaDefBiosLogoNY;
+        pThisCC->cbLogo = RT_MAX(pThisCC->cbLogo, g_cbVgaDefBiosLogoNY);
 # endif
     pThisCC->cbLogo += sizeof(LogoHdr);