From 7f3e4bd0bfd96a1a0259eac4f7e10a4746f55eab Mon Sep 17 00:00:00 2001 From: "Brian P. Hinz" Date: Fri, 26 Sep 2014 22:02:47 -0400 Subject: [PATCH] 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. --- unix/xserver/hw/vnc/Input.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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(); } -- 2.39.5