aboutsummaryrefslogtreecommitdiffstats
path: root/main/cairo/composite_color_glyphs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/cairo/composite_color_glyphs.patch')
-rw-r--r--main/cairo/composite_color_glyphs.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/main/cairo/composite_color_glyphs.patch b/main/cairo/composite_color_glyphs.patch
new file mode 100644
index 0000000000..97440f27f7
--- /dev/null
+++ b/main/cairo/composite_color_glyphs.patch
@@ -0,0 +1,58 @@
+From 79ad01724161502e8d9d2bd384ff1f0174e5df6e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 30 May 2019 07:30:55 -0400
+Subject: [PATCH] Fix a thinko in composite_color_glyphs
+
+We can't just move around the contents of the
+passed-in string, we need to make a copy. This
+was showing up as memory corruption in pango.
+
+See https://gitlab.gnome.org/GNOME/pango/issues/346
+---
+ src/cairo-surface.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Patch-Source: https://github.com/matthiasclasen/cairo/commit/79ad01724161502e8d9d2bd384ff1f0174e5df6e
+
+diff --git a/src/cairo-surface.c b/src/cairo-surface.c
+index c30f84087..e112b660a 100644
+--- a/src/cairo-surface.c
++++ b/src/cairo-surface.c
+@@ -2820,6 +2820,7 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ const cairo_clip_t *clip)
+ {
+ cairo_int_status_t status;
++ char *utf8_copy = NULL;
+
+ TRACE ((stderr, "%s\n", __FUNCTION__));
+ if (unlikely (surface->status))
+@@ -2847,6 +2848,10 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ status = CAIRO_INT_STATUS_UNSUPPORTED;
+
+ if (_cairo_scaled_font_has_color_glyphs (scaled_font)) {
++ utf8_copy = malloc (sizeof (char) * utf8_len);
++ memcpy (utf8_copy, utf8, sizeof (char) * utf8_len);
++ utf8 = utf8_copy;
++
+ status = composite_color_glyphs (surface, op,
+ source,
+ (char *)utf8, &utf8_len,
+@@ -2861,6 +2866,8 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ if (num_glyphs == 0)
+ goto DONE;
+ }
++ else
++ utf8_copy = NULL;
+
+ /* The logic here is duplicated in _cairo_analysis_surface show_glyphs and
+ * show_text_glyphs. Keep in synch. */
+@@ -2918,6 +2925,9 @@ _cairo_surface_show_text_glyphs (cairo_surface_t *surface,
+ surface->serial++;
+ }
+
++ if (utf8_copy)
++ free (utf8_copy);
++
+ return _cairo_surface_set_error (surface, status);
+ }
+