mirrors
/
freetype
mirror of https://github.com/freetype/freetype
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[truetype] Fix sanitizing logic for `loca' (#46223). 

* src/truetype/ttpload.c (tt_face_load_loca): A thinko caused an
incorrect adjustment of the number of glyphs, most often using far
too large values.
This commit is contained in:
Werner Lemberg 2015-10-26 15:40:22 +01:00
parent 7f00fa6462
commit 6a19a7d332
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2015-10-26 Werner Lemberg <wl@gnu.org>
[truetype] Fix sanitizing logic for `loca' (#46223).
* src/truetype/ttpload.c (tt_face_load_loca): A thinko caused an
incorrect adjustment of the number of glyphs, most often using far
too large values.
2015-10-25 Werner Lemberg <wl@gnu.org>
[autofit] Improve tracing.

12
src/truetype/ttpload.c
View File

@ -124,8 +124,9 @@
TT_Table entry = face->dir_tables;
TT_Table limit = entry + face->num_tables;
FT_Long pos = (FT_Long)FT_STREAM_POS();
FT_Long dist = 0x7FFFFFFFL;
FT_Long pos = (FT_Long)FT_STREAM_POS();
FT_Long dist = 0x7FFFFFFFL;
FT_Bool found = 0;
/* compute the distance to next table in font file */
@ -135,10 +136,13 @@
if ( diff > 0 && diff < dist )
dist = diff;
{
dist = diff;
found = 1;
}
}
if ( entry == limit )
if ( !found )
{
/* `loca' is the last table */
dist = (FT_Long)stream->size - pos;