Changeset 55819 in vbox

Timestamp:

May 12, 2015 10:10:36 AM (10 years ago)

Author:

vboxsync

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

100260

Message:

FE/Qt: Selector UI: Details pane: VM Preview: Make sure acquired guest-screen resolution is valid.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp

@@ -251 +251 @@
                     KGuestMonitorStatus monitorStatus = KGuestMonitorStatus_Enabled;
                     display.GetScreenResolution(0, uGuestWidth, uGuestHeight, uBpp, iOriginX, iOriginY, monitorStatus);
+                    if (uGuestWidth == 0 || uGuestHeight == 0)
+                    {
+                        AssertMsgFailed(("Acquired guest screen resolution is %dx%d\n",
+                                         uGuestWidth, uGuestHeight));
+                        break;
+                    }
+
                     double dAspectRatio = (double)uGuestWidth / uGuestHeight;
                     /* Look for the best aspect-ratio preset preset: */
@@ -515 +522 @@
 QSize UIGMachinePreview::imageAspectRatioSize(const QSize &hostSize, const QSize &guestSize)
 {
+    /* Make sure host-size and guest-size are valid: */
+    AssertReturn(!hostSize.isNull(), QSize());
+    AssertReturn(!guestSize.isNull(), hostSize);
+
     /* Calculate host/guest aspect-ratio: */
     const double dHostAspectRatio = (double)hostSize.width() / hostSize.height();