diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-02-09 12:04:25 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-02-09 12:04:25 +0000 |
| commit | a9a3b3d099f3f42b9cd63e716d5376ae231dfbf8 (patch) | |
| tree | 74dbaf70a06a7401b401dad6784c5c047825efb7 /x11-servers/XFree86-4-Server-snap | |
| parent | Add WeeChat 0.0.5. (diff) | |
Fix buffer overflow in font alias handling code.
Approved by: so
Notes
Notes:
svn path=/head/; revision=100491
Diffstat (limited to 'x11-servers/XFree86-4-Server-snap')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 1 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/files/patch-dirfile.c | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 6c53334143fa..ccd8a0f89e7b 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -7,6 +7,7 @@ PORTNAME= Server PORTVERSION= 4.3.99.15 +PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S|source/||:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} diff --git a/x11-servers/XFree86-4-Server-snap/files/patch-dirfile.c b/x11-servers/XFree86-4-Server-snap/files/patch-dirfile.c new file mode 100644 index 000000000000..b0891cdd6ea8 --- /dev/null +++ b/x11-servers/XFree86-4-Server-snap/files/patch-dirfile.c @@ -0,0 +1,13 @@ +--- lib/font/fontfile/dirfile.c.orig Fri May 31 20:45:50 2002 ++++ lib/font/fontfile/dirfile.c Thu Feb 5 00:19:57 2004 +@@ -286,6 +286,10 @@ + status = AllocError; + break; + case NAME: ++ if (strlen(lexToken) >= sizeof(alias)) { ++ status = BadFontPath; ++ break; ++ } + strcpy(alias, lexToken); + token = lexAlias(file, &lexToken); + switch (token) { |