From: Brian P. Hinz Date: Sat, 27 Sep 2014 02:02:47 +0000 (-0400) Subject: Fix pointer initialization to prevent NULL events. X-Git-Tag: v1.3.90~24^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F42%2Fhead;p=tigervnc.git Fix pointer initialization to prevent NULL events. Moved call to initEventq() into InitInputDevice() to prevent NULL events from being passed in. The surrounding IFDEF explains why Red Hat BZ bug #820443 just went away, EL6 bumped the version of xorg-x11-server-source to 1.13 at EL6.4. --- diff --git a/unix/xserver/hw/vnc/Input.cc b/unix/xserver/hw/vnc/Input.cc index 16fb9007..3aae5dbf 100644 --- a/unix/xserver/hw/vnc/Input.cc +++ b/unix/xserver/hw/vnc/Input.cc @@ -126,10 +126,6 @@ InputDevice::InputDevice() vncInputDevice = this; -#if XORG < 111 - initEventq(); -#endif - for (i = 0;i < 256;i++) pressedKeys[i] = NoSymbol; } @@ -360,6 +356,10 @@ void InputDevice::InitInputDevice(void) FatalError("Failed to activate TigerVNC devices\n"); #endif /* 17 */ +#if XORG < 111 + initEventq(); +#endif + PrepareInputDevices(); }