organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-05 05:25:05 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 9

[directwrite] Fix applying features to directwrite shaper

Browse source 
The range_features was ending up with random data because
hb_ms_make_feature_ranges() keeps pointers to data allocated in
feature_records and range_records, but that data was getting freed
before range_features was used. Change the variable scope to avoid
freeing the data too early.

Fixes https://github.com/harfbuzz/harfbuzz/issues/5113
This commit is contained in:
Khaled Hosny 2025-03-07 02:53:43 +02:00
parent fe8a3972dd
commit 9abaf193d3
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/hb-directwrite.cc
View file

@ -637,11 +637,13 @@ _hb_directwrite_shape (hb_shape_plan_t *shape_plan,
static_assert ((sizeof (DWRITE_FONT_FEATURE) == sizeof (hb_ms_feature_t)), "");
hb_vector_t<hb_ms_features_t *> range_features;
hb_vector_t<uint32_t> range_char_counts;
hb_vector_t<hb_ms_feature_t> feature_records;
hb_vector_t<hb_ms_range_record_t> range_records;
if (num_features)
{
hb_vector_t<hb_ms_feature_t> feature_records;
hb_vector_t<hb_ms_range_record_t> range_records;
if (hb_ms_setup_features (features, num_features, feature_records, range_records))
{
hb_ms_make_feature_ranges (feature_records,
range_records,
0,
@ -649,6 +651,7 @@ _hb_directwrite_shape (hb_shape_plan_t *shape_plan,
log_clusters,
range_features,
range_char_counts);
}
}
uint16_t* clusterMap;

1
test/shape/data/in-house/tests/directwrite.tests
View file

@ -1 +1,2 @@
../fonts/872d2955d326bd6676a06f66b8238ebbaabc212f.ttf;--shaper=directwrite;U+0628,U+0628,U+0628;[uni0628.fina=2+883|uni0628.medi_High=1+244|uni0628.init_High=0+233]
../fonts/872d2955d326bd6676a06f66b8238ebbaabc212f.ttf;--shaper=directwrite --features=-calt;U+0628,U+0628,U+0628;[uni0628.fina=2+883|uni0628.medi=1+244|uni0628.init=0+190]