From 269a44d92e2fc15631b86cc0c7135baf2023f312 Mon Sep 17 00:00:00 2001
From: Robin Watts <robin.watts@artifex.com>
Date: Thu, 12 Jan 2012 15:31:24 +0000
Subject: Avoid possible array overrun (and SEGV).

Check for cid being in range before using it. Thanks to Zeniko for
spotting this.
---
 pdf/pdf_font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pdf')

diff --git a/pdf/pdf_font.c b/pdf/pdf_font.c
index a04e6b56..d0a7241d 100644
--- a/pdf/pdf_font.c
+++ b/pdf/pdf_font.c
@@ -130,7 +130,7 @@ static int ft_cid_to_gid(pdf_font_desc *fontdesc, int cid)
 		return ft_char_index(fontdesc->font->ft_face, cid);
 	}
 
-	if (fontdesc->cid_to_gid)
+	if (fontdesc->cid_to_gid && cid < fontdesc->cid_to_gid_len && cid >= 0)
 		return fontdesc->cid_to_gid[cid];
 
 	return cid;
-- 
cgit v1.2.3