Attachment 13583 Details for Bug 13526 – patch from Alan - libXfont part

[patch] patch from Alan - libXfont part

libXfont-pcf.diff (text/plain), 1.13 KB, created by Matthieu Herrb on 2008-01-08 00:52:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Herrb

Created: 2008-01-08 00:52:30 UTC

Size: 1.13 KB

patch

obsolete

>diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
>index fd41849..c5db255 100644
>--- a/src/bitmap/pcfread.c
>+++ b/src/bitmap/pcfread.c
>@@ -588,6 +588,9 @@ pcfReadFont(FontPtr pFont, FontFilePtr file,
>     pFont->info.lastRow = pcfGetINT16(file, format);
>     pFont->info.defaultCh = pcfGetINT16(file, format);
>     if (IS_EOF(file)) goto Bail;
>+    if (pFont->info.firstCol > pFont->info.lastCol ||
>+       pFont->info.firstRow > pFont->info.lastRow ||
>+       pFont->info.lastCol-pFont->info.firstCol > 255) goto Bail;
> 
>     nencoding = (pFont->info.lastCol - pFont->info.firstCol + 1) *
> 	(pFont->info.lastRow - pFont->info.firstRow + 1);
>@@ -726,6 +729,9 @@ pcfReadFontInfo(FontInfoPtr pFontInfo, FontFilePtr file)
>     pFontInfo->lastRow = pcfGetINT16(file, format);
>     pFontInfo->defaultCh = pcfGetINT16(file, format);
>     if (IS_EOF(file)) goto Bail;
>+    if (pFontInfo->firstCol > pFontInfo->lastCol ||
>+       pFontInfo->firstRow > pFontInfo->lastRow ||
>+       pFontInfo->lastCol-pFontInfo->firstCol > 255) goto Bail;
> 
>     nencoding = (pFontInfo->lastCol - pFontInfo->firstCol + 1) *
> 	(pFontInfo->lastRow - pFontInfo->firstRow + 1);

Actions: View | Splinter Review

Attachments on bug 13526: 12946 | 12947 | 13582 | 13583

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.