walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix when no feature is given

This commit is contained in:
Ebrahim Byagowi 2016-04-05 21:01:05 +00:00
parent 4a10402169
commit d3134a66ad
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-directwrite.cc
View File

@ -658,7 +658,7 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
} }
ALLOCATE_ARRAY(WORD, log_clusters, chars_len); ALLOCATE_ARRAY(WORD, log_clusters, chars_len);
if (num_features) // if (num_features)
{ {
/* Need log_clusters to assign features. */ /* Need log_clusters to assign features. */
chars_len = 0; chars_len = 0;
@ -715,7 +715,7 @@ _hb_directwrite_shape(hb_shape_plan_t *shape_plan,
DWRITE_TYPOGRAPHIC_FEATURES singleFeatures; DWRITE_TYPOGRAPHIC_FEATURES singleFeatures;
singleFeatures.featureCount = num_features; singleFeatures.featureCount = num_features;
if (num_features != 0) if (num_features)
{ {
DWRITE_FONT_FEATURE* dwfeatureArray = (DWRITE_FONT_FEATURE*) DWRITE_FONT_FEATURE* dwfeatureArray = (DWRITE_FONT_FEATURE*)
malloc (sizeof (DWRITE_FONT_FEATURE) * num_features); malloc (sizeof (DWRITE_FONT_FEATURE) * num_features);
@ -961,7 +961,9 @@ retry_getjustifiedglyphs:
free (glyphProperties); free (glyphProperties);
free (glyphAdvances); free (glyphAdvances);
free (glyphOffsets); free (glyphOffsets);
free (singleFeatures.features);
if (num_features)
free (singleFeatures.features);
/* Wow, done! */ /* Wow, done! */
return true; return true;