From 73abb373e65d3617cdf39dcc8b8b47dd3d7d4c2d Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@bluenote.herrb.com>
Date: Thu, 17 Jan 2008 15:29:06 +0100
Subject: [PATCH] Fix for CVE-2008-0006 - PCF Font parser buffer overflow.
 (cherry picked from commit f09b8007e7f6e60e0b9c9665ec632b578ae08b6f)

---
 dix/dixfonts.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 02b6be6ef..ad540c68c 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -329,6 +329,13 @@ doOpenFont(ClientPtr client, OFclosurePtr c)
 	err = BadFontName;
 	goto bail;
     }
+    /* check values for firstCol, lastCol, firstRow, and lastRow */
+    if (pfont->info.firstCol > pfont->info.lastCol ||
+       pfont->info.firstRow > pfont->info.lastRow ||
+       pfont->info.lastCol - pfont->info.firstCol > 255) {
+       err = AllocError;
+       goto bail;
+    }
     if (!pfont->fpe)
 	pfont->fpe = fpe;
     pfont->refcnt++;