Copied from Debian.

From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001
From: Heiko Lewin <heiko.lewin@worldiety.de>
Date: Tue, 15 Dec 2020 16:48:19 +0100
Subject: [PATCH] Fix mask usage in image-compositor

[trimmed test case, since not used in Debian build]

---
 src/cairo-image-compositor.c                |   8 ++--

--- cairo-1.16.0.orig/src/cairo-image-compositor.c
+++ cairo-1.16.0/src/cairo-image-compositor.c
@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_rende
 		    unsigned num_spans)
 {
     cairo_image_span_renderer_t *r = abstract_renderer;
-    uint8_t *m;
+    uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask);
     int x0;
 
     if (num_spans == 0)
 	return CAIRO_STATUS_SUCCESS;
 
     x0 = spans[0].x;
-    m = r->_buf;
+    m = base;
     do {
 	int len = spans[1].x - spans[0].x;
 	if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) {
@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_rende
 				      spans[0].x, y,
 				      spans[1].x - spans[0].x, h);
 
-	    m = r->_buf;
+	    m = base;
 	    x0 = spans[1].x;
 	} else if (spans[0].coverage == 0x0) {
 	    if (spans[0].x != x0) {
@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_rende
 #endif
 	    }
 
-	    m = r->_buf;
+	    m = base;
 	    x0 = spans[1].x;
 	} else {
 	    *m++ = spans[0].coverage;
id=d461dd81cd688ddd63892204a19b3456810352e8'>tree</a><a href='/guix/commit/gnu/packages/patches/glibc-locales-2.28.patch?id=d461dd81cd688ddd63892204a19b3456810352e8'>commit</a><a href='/guix/diff/gnu/packages/patches/glibc-locales-2.28.patch?id=d461dd81cd688ddd63892204a19b3456810352e8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/glibc-locales-2.28.patch'>
<input type='hidden' name='id' value='d461dd81cd688ddd63892204a19b3456810352e8'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d461dd81cd688ddd63892204a19b3456810352e8'>root</a>/<a href='/guix/log/gnu?id=d461dd81cd688ddd63892204a19b3456810352e8'>gnu</a>/<a href='/guix/log/gnu/packages?id=d461dd81cd688ddd63892204a19b3456810352e8'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=d461dd81cd688ddd63892204a19b3456810352e8'>patches</a>/<a href='/guix/log/gnu/packages/patches/glibc-locales-2.28.patch?id=d461dd81cd688ddd63892204a19b3456810352e8'>glibc-locales-2.28.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/glibc-locales-2.28.patch?id=d461dd81cd688ddd63892204a19b3456810352e8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>