Changeset 83557 in vbox for trunk

Timestamp:

Apr 4, 2020 3:52:48 PM (5 years ago)

Author:

vboxsync

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

136895

Message:

VMSVGA: ignore a wrong request to update cursor (in addition to r136863), bugref:9690

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -3173 +3173 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
+    AssertReturn(uScreenId < pThis->mcMonitors, VERR_INVALID_PARAMETER);
 
     if (pThis->maFramebuffers[uScreenId].fVBVAEnabled)
@@ -3201 +3202 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
+    AssertReturnVoid(uScreenId < pThis->mcMonitors);
 
     DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
@@ -3264 +3266 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
-    DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
+    DISPLAYFBINFO *pFBInfo;
+    AssertReturnVoid(uScreenId < pThis->mcMonitors);
+
+    pFBInfo = &pThis->maFramebuffers[uScreenId];
 
     if (pFBInfo->fDefaultFormat)
@@ -3347 +3352 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
     Display *pThis = pDrv->pDisplay;
-    DISPLAYFBINFO *pFBInfo = &pThis->maFramebuffers[uScreenId];
+    DISPLAYFBINFO *pFBInfo;
+    AssertReturnVoid(uScreenId < pThis->mcMonitors);
+
+    pFBInfo = &pThis->maFramebuffers[uScreenId];
 
     /** @todo handleFramebufferUpdate (uScreenId,