Attachment 15938 Details for Bug 49296

[patch] dirfile.c.diff

dirfile.c.diff (text/plain), 1.96 KB, created by Thomas Biege on 2004-02-12 00:07:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2004-02-12 00:07:59 UTC

Size: 1.96 KB

patch

obsolete

>--- lib/font/fontfile/dirfile.c.orig	2004-02-11 16:19:24.000000000 +0100
>+++ lib/font/fontfile/dirfile.c	2004-02-11 16:19:31.000000000 +0100
>@@ -52,11 +52,11 @@ static int lexc ( FILE *file );
> int
> FontFileReadDirectory (char *directory, FontDirectoryPtr *pdir)
> {
>-    char        file_name[MAXFONTFILENAMELEN];
>-    char        font_name[MAXFONTNAMELEN];
>-    char        dir_file[MAXFONTFILENAMELEN];
>+    char        file_name[MAXFONTFILENAMELEN] = {0};
>+    char        font_name[MAXFONTNAMELEN] = {0};
>+    char        dir_file[MAXFONTFILENAMELEN] = {0};
> #ifdef FONTDIRATTRIB
>-    char	dir_path[MAXFONTFILENAMELEN];
>+    char	dir_path[MAXFONTFILENAMELEN] = {0};
>     char	*ptr;
> #endif
>     FILE       *file;
>@@ -68,6 +68,10 @@ FontFileReadDirectory (char *directory, 
> 
>     FontDirectoryPtr	dir = NullFontDirectory;
> 
>+    if (strlen(directory) + strlen(FontDirFile) + 1 >= sizeof(dir_file))
>+      return BadFontPath;
>+
>+    
> #ifdef FONTDIRATTRIB
>     /* Check for font directory attributes */
> #ifndef __UNIXOS2__
>@@ -251,6 +255,9 @@ ReadFontAlias(char *directory, Bool isFi
>     int			status = Successful;
>     struct stat		statb;
> 
>+    if (strlen(directory) + strlen(FontAliasFile) + 1 >= sizeof(alias_file))
>+      return BadFontPath;
>+
>     dir = *pdir;
>     strcpy(alias_file, directory);
>     if (!isFile) {
>@@ -286,6 +293,10 @@ ReadFontAlias(char *directory, Bool isFi
> 	    status = AllocError;
> 	    break;
> 	case NAME:
>+	    if (strlen(lexToken) >= sizeof(alias)) {
>+		status = BadFontPath;
>+		break;
>+	    }
> 	    strcpy(alias, lexToken);
> 	    token = lexAlias(file, &lexToken);
> 	    switch (token) {
>@@ -302,6 +313,10 @@ ReadFontAlias(char *directory, Bool isFi
> 		status = AllocError;
> 		break;
> 	    case NAME:
>+		if (strlen(lexToken) >= sizeof(font_name)) {
>+		    status = BadFontPath;
>+		    break;
>+		}
> 		CopyISOLatin1Lowered(alias, alias, strlen(alias));
> 		CopyISOLatin1Lowered(font_name, lexToken, strlen(lexToken));
> 		if (!FontFileAddFontAlias (dir, alias, font_name))

Actions: View | Diff

Attachments on bug 49296: 15852 | 15853 | 15854 | 15856 | 15857 | 15858 | 15860 | 15861 | 15925 | 15938 | 15939 | 15947 | 16168 | 16169 | 16180 | 16183 | 16184