rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[pcf] Fix handling of very large fonts (#47708). 

* src/pcf/pcfread.c (pcf_get_encodings): Make `encodingOffset' an
unsigned short.
Only reject `0xFFFF' as an invalid encoding offset.
This commit is contained in:
Alexei Podtelezhnikov 2016-06-26 08:27:29 +02:00 committed by Werner Lemberg
parent 8ba407a7fe
commit 999bcee2d7
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,4 +1,12 @@
2016-04-24 Werner Lemberg <wl@gnu.org>
2016-06-26 Alexei Podtelezhnikov <apodtele@gmail.com>
[pcf] Fix handling of very large fonts (#47708).
* src/pcf/pcfread.c (pcf_get_encodings): Make `encodingOffset' an
unsigned short.
Only reject `0xFFFF' as an invalid encoding offset.
2016-06-25 Werner Lemberg <wl@gnu.org>
[truetype] Really fix deallocation in case of error (#47726).

14
src/pcf/pcfread.c
View File

@ -849,7 +849,7 @@ THE SOFTWARE.
int firstCol, lastCol;
int firstRow, lastRow;
FT_ULong nencoding;
int encodingOffset;
FT_UShort encodingOffset;
int i, j;
FT_ULong k;
PCF_Encoding encoding = NULL;
@ -921,15 +921,19 @@ THE SOFTWARE.
{
for ( j = firstCol; j <= lastCol; j++ )
{
/* X11's reference implementation uses the equivalent to */
/* `FT_GET_SHORT', however PCF fonts with more than 32768 */
/* characters (e.g. `unifont.pcf') clearly show that an */
/* unsigned value is needed. */
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
encodingOffset = FT_GET_SHORT();
encodingOffset = FT_GET_USHORT();
else
encodingOffset = FT_GET_SHORT_LE();
encodingOffset = FT_GET_USHORT_LE();
if ( encodingOffset > -1 )
if ( encodingOffset != 0xFFFFU )
{
encoding[k].enc = i * 256 + j;
encoding[k].glyph = (FT_UShort)encodingOffset;
encoding[k].glyph = encodingOffset;
FT_TRACE5(( " code %d (0x%04X): idx %d\n",
encoding[k].enc, encoding[k].enc, encoding[k].glyph ));