From 0514f8b65616d8878000764485e71384b71e3860 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Tue, 21 Sep 2004 17:57:36 +0000 Subject: [PATCH] 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. --- hw/xfree86/common/xf86Init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index f507753fe..3aaac93d4 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1244,7 +1244,7 @@ AbortDDX() /* * try to deinitialize all input devices */ - if (xf86Info.pKeyboard) + if (xf86Info.kbdProc && xf86Info.pKeyboard) (xf86Info.kbdProc)(xf86Info.pKeyboard, DEVICE_CLOSE); /*