summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2000-06-09 06:34:22 +0000
committerKris Kennaway <kris@FreeBSD.org>2000-06-09 06:34:22 +0000
commitea98d5a80b69a2d6d94734a85648ec591ab933a2 (patch)
tree60f4e6e384ef81e00fd03f799157fbd89e8c0a96 /x11
parentCompile in i810 graphics driver support (without AGP kernel support). (diff)
Fix the known root hole. This port is still dangerous.
Submitted by: Trevor Johnson <trevor@jpj.net> (patch-i) Doug Rabson <dfr@freebsd.org> (patch-j)
Notes
Notes: svn path=/head/; revision=29430
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4/files/patch-j15
1 files changed, 15 insertions, 0 deletions
diff --git a/x11/XFree86-4/files/patch-j b/x11/XFree86-4/files/patch-j
new file mode 100644
index 000000000000..2711f24562b3
--- /dev/null
+++ b/x11/XFree86-4/files/patch-j
@@ -0,0 +1,15 @@
+--- programs/Xserver/xkb/ddxLoad.c~ 1999/12/05 01:22:09
++++ programs/Xserver/xkb/ddxLoad.c 2000/05/24 15:08:12
+@@ -237,6 +237,13 @@
+ sprintf(keymap,"server-%s",display);
+ }
+ else {
++ if (strlen(names->keymap) > PATH_MAX - 1) {
++#ifdef DEBUG
++ ErrorF("name of keymap (%s) exceeds max length\n",
++ names->keymap);
++#endif
++ return False;
++ }
+ strcpy(keymap,names->keymap);
+ }