Fix Savannah bug #41310.

* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) <glyph_format==5>:
Don't check metrics, which this format doesn't have.
This is another correction to the commit from 2013-11-21.
This commit is contained in:
Werner Lemberg 2014-01-23 09:14:25 +01:00
parent 8b281f83e8
commit 752f39127b
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2014-01-23 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #41310.
* src/sfnt/ttsbit.c (tt_sbit_decoder_load_bitmap) <glyph_format==5>:
Don't check metrics, which this format doesn't have.
This is another correction to the commit from 2013-11-21.
2014-01-23 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #41309.

View File

@ -4,7 +4,7 @@
/* */
/* TrueType and OpenType embedded bitmap support (body). */
/* */
/* Copyright 2005-2009, 2013 by */
/* Copyright 2005-2009, 2013, 2014 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* Copyright 2013 by Google, Inc. */
@ -967,7 +967,6 @@
break;
case 2:
case 5:
case 7:
{
/* Don't trust `glyph_format'. For example, Apple's main Korean */
@ -997,6 +996,10 @@
}
break;
case 5:
loader = tt_sbit_decoder_load_bit_aligned;
break;
case 8:
if ( p + 1 > p_limit )
goto Fail;