diff options
| author | Norbert Lange | 2009-08-24 17:51:47 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-24 17:51:47 +0000 |
| commit | 917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5 (patch) | |
| tree | e652563203a00f8acecfaafbf93c64dbfbd13f25 /graphics/sjis.cpp | |
| parent | 5f87d5090cfcb34cda3c1f5d430e0865344d7366 (diff) | |
| parent | dd7868acc2512c9761d892e67a4837f4dc38bdc0 (diff) | |
| download | scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.gz scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.tar.bz2 scummvm-rg350-917d4b78b36d6c5a5c25a03e7ee6a1c1b6a85fd5.zip | |
Merge with trunk
svn-id: r43701
Diffstat (limited to 'graphics/sjis.cpp')
| -rw-r--r-- | graphics/sjis.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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; } |