minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[base] Really fix #57194. 

Apply accidentally missed second part of patch.

* src/base/ftgloadr.c (FT_GlyphLoader_CheckPoints): Call
`FT_GlyphLoader_CreateExtra'.
This commit is contained in:
John Stracke 2019-11-23 11:25:28 +01:00 committed by Werner Lemberg
parent 9df460b632
commit d4f9c24989
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2019-11-23 John Stracke <jstracke@Google.com>
[base] Really fix #57194.
Apply accidentally missed second part of patch.
* src/base/ftgloadr.c (FT_GlyphLoader_CheckPoints): Call
`FT_GlyphLoader_CreateExtra'.
2019-11-23 Werner Lemberg <wl@gnu.org>
[truetype] Avoid sanitizer warning (#57289).

8
src/base/ftgloadr.c
View File

@ -215,6 +215,10 @@
FT_UInt new_max, old_max;
error = FT_GlyphLoader_CreateExtra( loader );
if ( error )
return error;
/* check points & tags */
new_max = (FT_UInt)base->n_points + (FT_UInt)current->n_points +
n_points;
@ -248,6 +252,10 @@
loader->max_points = new_max;
}
error = FT_GlyphLoader_CreateExtra( loader );
if ( error )
return error;
/* check contours */
old_max = loader->max_contours;
new_max = (FT_UInt)base->n_contours + (FT_UInt)current->n_contours +