Changeset 15946 in vbox

Timestamp:

Jan 14, 2009 6:06:27 PM (16 years ago)

Author:

vboxsync

Message:

Additions/x11: fix a segfault in vboxmouse with Xorg server 1.5 under some circumstances

File:

• trunk/src/VBox/Additions/x11/xmouse/xorg15/vboxmouse.c (modified) (2 diffs)

trunk/src/VBox/Additions/x11/xmouse/xorg15/vboxmouse.c

@@ -56 +56 @@
 #include <xf86Xinput.h>
 #include <exevents.h>
+#include <mipointer.h>
 
 #include <xf86Module.h>
@@ -67 +68 @@
     uint32_t cx, cy, fFeatures;
 
-    if (RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy)))
+    /* The first test here is a workaround for an apparant bug in Xorg Server 1.5 */
+    if (   miPointerGetScreen(pInfo->dev) != NULL
+        && RT_SUCCESS(VbglR3GetMouseStatus(&fFeatures, &cx, &cy)))
         /* send absolute movement */
         xf86PostMotionEvent(pInfo->dev, 1, 0, 2, cx, cy);