summaryrefslogtreecommitdiff
path: root/src/List.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-09-21 17:57:36 +0000
committerEgbert Eich <eich@suse.de>2004-09-21 17:57:36 +0000
commit4904540c4399fed01ce0d1977a0b5d3af173b66c (patch)
tree6cdb7dfe47db72f22011ed7e20f2c4c3418618dc /src/List.c
parentc7f720ae3f0dea94bc6e9eb9bdbbf00e6bb16b24 (diff)
downloadxorg-lib-libXaw-4904540c4399fed01ce0d1977a0b5d3af173b66c.tar.gz
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.
Diffstat (limited to 'src/List.c')
-rw-r--r--src/List.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/List.c b/src/List.c
index e298f3a..e93dc4e 100644
--- a/src/List.c
+++ b/src/List.c
@@ -471,6 +471,10 @@ XawListInitialize(Widget temp1, Widget cnew, ArgList args, Cardinal *num_args)
{
ListWidget lw = (ListWidget)cnew;
+ if (!lw->list.font) XtError("Aborting: no font found\n");
+ if (lw->simple.international && !lw->list.fontset)
+ XtError("Aborting: no fontset found\n");
+
/*
* Initialize all private resources
*/