[cairo-commit] 2 commits - src/cairo-colr-glyph-render.c

[GitLab Mirror]

 src/cairo-colr-glyph-render.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2490c8bc0eac04fb6e223447bbf2e3f74759ac46
Merge: ea51a5d66 3b807c1d7
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jan 24 00:27:24 2023 +0000

    Merge branch 'colrv1-fix-crash' into 'master'
    
    [colrv1] Fix crash in get_palette_color
    
    See merge request cairo/cairo!421

commit 3b807c1d7e49b8887efb30c5029df0c2cb756c29
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jan 23 16:50:48 2023 -0700

    [colrv1] Fix crash in get_palette_color
    
    is_foreground_color can be NULL.

diff --git a/src/cairo-colr-glyph-render.c b/src/cairo-colr-glyph-render.c
index 3b345f111..104942b78 100644
--- a/src/cairo-colr-glyph-render.c
+++ b/src/cairo-colr-glyph-render.c
@@ -246,8 +246,8 @@ get_palette_color (cairo_colr_glyph_render_t *render,
     }
 
     color->alpha *= double_from_2_14 (ci->alpha);
-    if (foreground)
-        *is_foreground_color = TRUE;
+    if (is_foreground_color)
+        *is_foreground_color = foreground;
 }
 
 static cairo_status_t