[Scummvm-cvs-logs] SF.net SVN: scummvm:[43532] scummvm/trunk/graphics/sjis.cpp

[lordhoto at users.sourceforge.net]

Revision: 43532
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43532&view=rev
Author:   lordhoto
Date:     2009-08-19 08:37:20 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Add another range check in our SJIS font code to avoid out of bounds access.

Modified Paths:
--------------
    scummvm/trunk/graphics/sjis.cpp

Modified: scummvm/trunk/graphics/sjis.cpp
===================================================================
--- scummvm/trunk/graphics/sjis.cpp	2009-08-19 08:30:15 UTC (rev 43531)
+++ scummvm/trunk/graphics/sjis.cpp	2009-08-19 08:37:20 UTC (rev 43532)
@@ -280,6 +280,11 @@
 	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;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.