diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2014-09-26 22:02:47 -0400 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2014-09-29 19:47:25 -0400 |
| commit | 7f3e4bd0bfd96a1a0259eac4f7e10a4746f55eab (patch) | |
| tree | 1a430901e8b8266882f9bebdfbeb58a50903a46b /unix/xserver/hw | |
| parent | e7c169d738b07b45c2addac16b351334881ada61 (diff) | |
| download | tigervnc-7f3e4bd0bfd96a1a0259eac4f7e10a4746f55eab.tar.gz tigervnc-7f3e4bd0bfd96a1a0259eac4f7e10a4746f55eab.zip | |
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.
Diffstat (limited to 'unix/xserver/hw')
| -rw-r--r-- | unix/xserver/hw/vnc/Input.cc | 8 |
1 files 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(); } |