[PATCH v3] dwrite: Do not segfault when there are no typographic features to return.

3 Mar 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com>
---
 dlls/dwrite/shape.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c
index 6428bf6ceb0..abeb7eeac79 100644
--- a/dlls/dwrite/shape.c
+++ b/dlls/dwrite/shape.c
@@ -372,6 +372,12 @@ HRESULT shape_get_typographic_features(struct scriptshaping_context *context, co
     shape_get_script_lang_index(context, scripts, MS_GPOS_TAG, &script_index, &language_index);
     opentype_get_typographic_features(&context->cache->gpos, script_index, language_index, &t);
 
+    if (t.count == 0)
+    {
+        *actual_tagcount = 0;
+        return S_OK;
+    }
+
     /* Sort and remove duplicates. */
     qsort(t.tags, t.count, sizeof(*t.tags), tag_array_sorting_compare);
 
-- 
2.30.1

    

Giovanni Mascellani