frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged over libXpm security fix provided by Chris Evans, Matthieu Herrb and 

Alan Coopersmith from release 6.8.1.
Fail during initialization with error if font/fontset is not set for
    widget. This prevents a sig11 later when the non-existent font/fontset
    structs are referenced.
Check if xf86Info.kbdProc pointer is really set before calling it on abort
    as this pointer won't be set if the new modular keyboard driver is used
    (Matthias Hopf).
Added new libs to the bindist control files.
Removed inclusion of unnecessary kernel header on Linux. This may fail in
    an -ansi environment.
This commit is contained in:
Egbert Eich 2004-09-21 17:57:36 +00:00
parent 814b746621
commit 0514f8b656
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/xf86Init.c
View File

@ -1244,7 +1244,7 @@ AbortDDX()
/* /*
* try to deinitialize all input devices * try to deinitialize all input devices
*/ */
if (xf86Info.pKeyboard) if (xf86Info.kbdProc && xf86Info.pKeyboard)
(xf86Info.kbdProc)(xf86Info.pKeyboard, DEVICE_CLOSE); (xf86Info.kbdProc)(xf86Info.pKeyboard, DEVICE_CLOSE);
/* /*