Attachment 6830 Details for Bug 8000 – libXfont.diff

[patch] libXfont.diff

libXfont.diff (text/plain), 2.18 KB, created by Stefan Dirsch on 2006-09-05 12:56:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2006-09-05 12:56:31 UTC

Size: 2.18 KB

patch

obsolete

>diff -u -r lib/font/Type1/afm.c.orig lib/font/Type1/afm.c
>--- lib/font/Type1/afm.c.orig	2006-09-05 21:38:13.000000000 +0200
>+++ lib/font/Type1/afm.c	2006-09-05 21:39:33.000000000 +0200
>@@ -29,6 +29,7 @@
> #include <stdio.h>
> #include <string.h>
> #include <stdlib.h>
>+#include <limits.h>
> #else
> #include "Xmd.h"        /* For INT32 declaration */
> #include "Xdefs.h"      /* For Bool */
>@@ -118,6 +119,11 @@
>             
>             fi->nChars = atoi(p);
> 
>+	    if (fi->nChars < 0 || fi->nChars > INT_MAX / sizeof(Metrics)) {
>+		xfree(afmbuf);
>+		xfree(fi);
>+		return(1);
>+	    }
>             fi->metrics = (Metrics *)xalloc(fi->nChars * 
>                 sizeof(Metrics));
>             if (fi->metrics == NULL) {
>diff -u -r lib/font/Type1/scanfont.c.orig lib/font/Type1/scanfont.c
>--- lib/font/Type1/scanfont.c.orig	2006-09-05 21:38:13.000000000 +0200
>+++ lib/font/Type1/scanfont.c		2006-09-05 21:39:22.000000000 +0200
>@@ -57,6 +57,7 @@
> 
> #ifndef FONTMODULE
> #include <string.h>
>+#include <limits.h>
> #else
> #include "Xdefs.h"	/* Bool declaration */
> #include "Xmd.h"	/* INT32 declaration */
>@@ -654,6 +655,7 @@
>   arrayP->data.valueP = tokenStartP;
> 
>   /* allocate FDArray */
>+  /* No integer overflow since arrayP->len is unsigned short */
>   FDArrayP = (psfont *)vm_alloc(arrayP->len*(sizeof(psfont)));
>   if (!(FDArrayP)) return(SCAN_OUT_OF_MEMORY);
> 
>@@ -850,7 +852,8 @@
>      }
>      return(SCAN_OK);
>    }
>- 
>+   if (N > INT_MAX / sizeof(psobj)) 
>+       return (SCAN_ERROR);
>    arrayP = (psobj *)vm_alloc(N*sizeof(psobj));
>    if (!(arrayP) ) return(SCAN_OUT_OF_MEMORY);
>    FontP->Subrs.len = N;
>@@ -911,7 +914,7 @@
>      }
>      else return(rc);  /* if next token was not an Int */
>    }
>-   if (N<=0) return(SCAN_ERROR);
>+   if (N<=0 || N > INT_MAX / sizeof(psdict)) return(SCAN_ERROR);
>    /* save number of entries in the dictionary */
>  
>    dictP = (psdict *)vm_alloc((N+1)*sizeof(psdict));
>@@ -1719,6 +1722,10 @@
>     if (tokenType == TOKEN_INTEGER)
>       rangecnt = tokenValue.integer;
> 
>+    if (rangecnt < 0 || rangecnt > INT_MAX / sizeof(spacerangecode)) {
>+	rc = SCAN_ERROR;
>+	break;
>+    }
>     /* ==> tokenLength, tokenTooLong, tokenType, and */
>     /* tokenValue are now set                        */
>

Actions: View | Splinter Review

Attachments on bug 8000: 6731 | 6830

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.