From 2597814af37711dce00594e71c6f2e5aaecdb96a Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 19 Aug 2009 08:37:20 +0000
Subject: Add another range check in our SJIS font code to avoid out of bounds
 access.

svn-id: r43532
---
 graphics/sjis.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'graphics/sjis.cpp')

diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 405d8622c2..9f5def8f10 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -280,6 +280,11 @@ const uint16 *FontSjisSVM::getCharData(uint16 c) const {
 	if (index >= 0x3F)
 		--index;
 
+	// Another check if the passed character was an
+	// correctly encoded SJIS character.
+	if (index < 0 || index >= 0xBC || base < 0)
+		return 0;
+
 	return _fontData + (base * 0xBC + index) * 16;
 }
 
-- 
cgit v1.2.3