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

* src/sfnt/sfwoff2.c (woff2_open_font): Fix sanity check. 

Correct thinkos in patch from 2019-09-01.
This commit is contained in:
Werner Lemberg 2019-09-28 07:42:34 +02:00
parent 2bf603bde6
commit c37a501458
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2019-09-28 Werner Lemberg <wl@gnu.org>
* src/sfnt/sfwoff2.c (woff2_open_font): Fix sanity check.
Correct thinkos in patch from 2019-09-01.
2019-09-28 Werner Lemberg <wl@gnu.org>
[woff2] Fix memory leaks.

11
src/sfnt/sfwoff2.c
View File

@ -2107,8 +2107,8 @@
/* However, adjust the value to something reasonable. */
/* Factor 64 is heuristic. */
if ( ( woff2.totalSfntSize >> 6 ) > sfnt_size )
sfnt_size <<= 6;
if ( ( woff2.totalSfntSize >> 6 ) > woff2.length )
sfnt_size = woff2.length << 6;
else
sfnt_size = woff2.totalSfntSize;
@ -2116,8 +2116,11 @@
if (sfnt_size >= (1 << 26))
sfnt_size = 1 << 26;
FT_TRACE4(( "adjusting estimate of uncompressed font size to %lu\n",
sfnt_size ));
#ifdef FT_DEBUG_LEVEL_TRACE
if ( sfnt_size != woff2.totalSfntSize )
FT_TRACE4(( "adjusting estimate of uncompressed font size to %lu\n",
sfnt_size ));
#endif
}
/* Write sfnt header. */