[cairo-commit] 2 commits - src/cairo-ft-font.c

[GitLab Mirror]

 src/cairo-ft-font.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6edf572ebb27b00d3c371ba5ae267e39d27d5b6d
Merge: d061570a7 90e85c249
Author: Uli Schlachter <psychon at znc.in>
Date:   Wed Jan 9 07:50:12 2019 +0100

    Merge branch 'ft-crash' of gitlab.freedesktop.org:carlosgc/cairo

commit 90e85c2493fdfa3551f202ff10282463f1e36645
Author: Carlos Garcia Campos <cgarcia at igalia.com>
Date:   Mon Nov 19 12:33:07 2018 +0100

    ft: Use FT_Done_MM_Var instead of free when available in cairo_ft_apply_variations
    
    Fixes a crash when using freetype >= 2.9

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 325dd61b4..981973f78 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2393,7 +2393,11 @@ skip:
 done:
         free (coords);
         free (current_coords);
+#if HAVE_FT_DONE_MM_VAR
+        FT_Done_MM_Var (face->glyph->library, ft_mm_var);
+#else
         free (ft_mm_var);
+#endif
     }
 }