diff --git a/backport-CVE-2022-44638.patch b/backport-CVE-2022-44638.patch deleted file mode 100644 index de51a0a058da9c2488226dcf63647b72b747061d..0000000000000000000000000000000000000000 --- a/backport-CVE-2022-44638.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001 -From: Matt Turner -Date: Wed, 2 Nov 2022 12:07:32 -0400 -Subject: [PATCH] Avoid integer overflow leading to out-of-bounds write - -Thanks to Maddie Stone and Google's Project Zero for discovering this -issue, providing a proof-of-concept, and a great analysis. - -Closes: https://gitlab.freedesktop.org/pixman/pixman/-/issues/63 - -Conflict:NA -Reference:https://gitlab.freedesktop.org/pixman/pixman/-/commit/a1f88e842e0216a5b4df1ab023caebe33c101395 ---- - pixman/pixman-trap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pixman/pixman-trap.c b/pixman/pixman-trap.c -index 91766fd..7560405 100644 ---- a/pixman/pixman-trap.c -+++ b/pixman/pixman-trap.c -@@ -74,7 +74,7 @@ pixman_sample_floor_y (pixman_fixed_t y, - - if (f < Y_FRAC_FIRST (n)) - { -- if (pixman_fixed_to_int (i) == 0x8000) -+ if (pixman_fixed_to_int (i) == 0xffff8000) - { - f = 0; /* saturate */ - } --- -GitLab - diff --git a/pixman-pixman-0.40.0.tar.bz2 b/pixman-pixman-0.40.0.tar.bz2 deleted file mode 100644 index 92acf784e18224ce768262ccf2ea28e571d47e08..0000000000000000000000000000000000000000 Binary files a/pixman-pixman-0.40.0.tar.bz2 and /dev/null differ diff --git a/pixman-pixman-0.42.2.tar.bz2 b/pixman-pixman-0.42.2.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..35484785e377b01f2cfb862d845de080d43512f3 Binary files /dev/null and b/pixman-pixman-0.42.2.tar.bz2 differ diff --git a/pixman.spec b/pixman.spec index a1ea49b3860b79cdf8eb4b03b2658b05ae365a2a..9d70b9dd0fb02826eb9ac54f4d5a03e7f63899ef 100644 --- a/pixman.spec +++ b/pixman.spec @@ -1,13 +1,11 @@ Name: pixman -Version: 0.40.0 -Release: 3 +Version: 0.42.2 +Release: 1 Summary: Pixman is a pixel manipulation library for X and Cairo License: MIT URL: https://gitlab.freedesktop.org/pixman/pixman Source0: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-%{version}/pixman-pixman-%{version}.tar.bz2 -Patch6000: backport-CVE-2022-44638.patch - BuildRequires: gcc meson %description @@ -55,6 +53,9 @@ sed -i 's/120/600/' test/meson.build %{_libdir}/pkgconfig/* %changelog +* Fri Feb 03 2023 zhangpan - 0.42.2-1 +- update to 0.42.2 + * Tue Nov 08 2022 wangkerong - 0.40.0-3 - fix CVE-2022-44638