Changeset 49603 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 21, 2013 2:45:47 PM (11 years ago)

Author:

vboxsync

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

90820

Message:

DevVGA,DisplayImpl: prevent access to invalid framebuffer.

File:

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

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

@@ -679 +679 @@
     }
 
-    mLastAddress = pvVRAM;
-    mLastBytesPerLine = cbLine;
-    mLastBitsPerPixel = bpp;
-    mLastWidth = w;
-    mLastHeight = h;
-    mLastFlags = flags;
+    if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+    {
+        mLastAddress = pvVRAM;
+        mLastBytesPerLine = cbLine;
+        mLastBitsPerPixel = bpp;
+        mLastWidth = w;
+        mLastHeight = h;
+        mLastFlags = flags;
+    }
 
     ULONG pixelFormat;
@@ -729 +732 @@
         return VINF_VGA_RESIZE_IN_PROGRESS;
     }
+
+    /* Framebuffer will be invalid during resize, make sure that it is not accessed. */
+    if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN)
+        mpDrv->pUpPort->pfnSetRenderVRAM (mpDrv->pUpPort, false);
 
     int rc = callFramebufferResize (maFramebuffers[uScreenId].pFramebuffer, uScreenId,
@@ -794 +801 @@
         }
 
+        /* Inform VRDP server about the change of display parameters.
+         * Must be done before calling NotifyUpdate below.
+         */
+        LogRelFlowFunc(("Calling VRDP\n"));
+        mParent->consoleVRDPServer()->SendResize();
+
         /* @todo Merge these two 'if's within one 'if (!pFBInfo->pFramebuffer.isNull())' */
         if (uScreenId == VBOX_VIDEO_PRIMARY_SCREEN && !pFBInfo->pFramebuffer.isNull())
@@ -864 +877 @@
         }
 #endif /* DEBUG_sunlover */
-
-        /* Inform VRDP server about the change of display parameters. */
-        LogRelFlowFunc(("Calling VRDP\n"));
-        mParent->consoleVRDPServer()->SendResize();
 
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)