Changeset 57180 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 4, 2015 4:01:29 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: fix a crash in KDM when it started a second server generation.

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (3 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -353 +353 @@
 
     /* Check that this code cannot trigger the resizing bug in X.Org Server 1.3.
-     * See the work-around in PreInit. */
+     * See the work-around in ScreenInit. */
     xf86RandR12GetOriginalVirtualSize(pScrn, &originalX, &originalY);
     VBVXASSERT(originalX == VBOX_VIDEO_MAX_VIRTUAL && originalY == VBOX_VIDEO_MAX_VIRTUAL, ("OriginalSize=%dx%d",
@@ -931 +931 @@
 
 #ifdef VBOXVIDEO_13
-    /* Work around a bug in the original X server modesetting code, which took
-     * the first valid values set to these two as maxima over the server
-     * lifetime.  This bug was introduced on Feb 15 2007 and was fixed in commit
-     * fa877d7f three months later, so it was present in X.Org Server 1.3. */
     pScrn->virtualX = VBOX_VIDEO_MAX_VIRTUAL;
     pScrn->virtualY = VBOX_VIDEO_MAX_VIRTUAL;
@@ -1328 +1324 @@
     }
 
+    /* Work around a bug in the original X server modesetting code, which took
+     * the first valid values set to these two as maxima over the server
+     * lifetime.  This bug was introduced on Feb 15 2007 and was fixed in commit
+     * fa877d7f three months later, so it was present in X.Org Server 1.3. */
+    pScrn->virtualX = VBOX_VIDEO_MAX_VIRTUAL;
+    pScrn->virtualY = VBOX_VIDEO_MAX_VIRTUAL;
+
     /* Initialise randr 1.2 mode-setting functions. */
     if (!xf86CrtcScreenInit(pScreen)) {