diff --git a/backport-CVE-2020-35492.patch b/backport-CVE-2020-35492.patch new file mode 100644 index 0000000000000000000000000000000000000000..04dbaf124b70ca83332d47504c50ed40d50b194b --- /dev/null +++ b/backport-CVE-2020-35492.patch @@ -0,0 +1,51 @@ +From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Tue, 15 Dec 2020 16:48:19 +0100 +Subject: [PATCH] Fix mask usage in image-compositor + +Conflict:NA +Reference:https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be +--- + src/cairo-image-compositor.c | 8 ++-- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c +index 79ad69f68..4f8aaed99 100644 +--- a/src/cairo-image-compositor.c ++++ b/src/cairo-image-compositor.c +@@ -2610,14 +2610,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + 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) { +@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + 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) { +@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, + #endif + } + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else { + *m++ = spans[0].coverage; + diff --git a/cairo.spec b/cairo.spec index debd8c44b14afebadeb4c36677fb237632292ff5..2e2b276cfed4b4c4022c0308e8d57fb7731ddad5 100644 --- a/cairo.spec +++ b/cairo.spec @@ -2,7 +2,7 @@ Name: cairo Version: 1.16.0 -Release: 3 +Release: 4 Summary: A 2D graphics library License: LGPLv2 or MPLv1.1 URL: http://cairographics.org @@ -14,6 +14,7 @@ Patch0003: 0003-cairo-composite_color_glyphs.patch Patch0004: 0004-cff-Allow-empty-array-of-operands-for-certain-operat.patch Patch6000: CVE-2019-6461.patch Patch6001: CVE-2019-6462.patch +Patch6002: backport-CVE-2020-35492.patch BuildRequires: pkgconfig glib2-devel librsvg2-devel BuildRequires: libXrender-devel libX11-devel libpng-devel libxml2-devel @@ -83,6 +84,12 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_bindir}/cairo-trace %changelog +* Thu Apr 1 2021 wangkerong - 1.16.0-4 +- Type:cve +- ID:CVE-2020-35492 +- SUG:NA +- DESC:fix CVE-2020-35492 + * Sun Sep 27 2020 wangye - 1.16.0-3 - fix source URL