!14 update to 0.42.2

From: @zppzhangpan 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-02-07 08:49:43 +00:00 committed by Gitee
commit 6f0e4bd4e3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 5 additions and 36 deletions

View File

@ -1,32 +0,0 @@
From a1f88e842e0216a5b4df1ab023caebe33c101395 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
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

Binary file not shown.

Binary file not shown.

View File

@ -1,13 +1,11 @@
Name: pixman Name: pixman
Version: 0.40.0 Version: 0.42.2
Release: 3 Release: 1
Summary: Pixman is a pixel manipulation library for X and Cairo Summary: Pixman is a pixel manipulation library for X and Cairo
License: MIT License: MIT
URL: https://gitlab.freedesktop.org/pixman/pixman URL: https://gitlab.freedesktop.org/pixman/pixman
Source0: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-%{version}/pixman-pixman-%{version}.tar.bz2 Source0: https://gitlab.freedesktop.org/pixman/pixman/-/archive/pixman-%{version}/pixman-pixman-%{version}.tar.bz2
Patch6000: backport-CVE-2022-44638.patch
BuildRequires: gcc meson BuildRequires: gcc meson
%description %description
@ -55,6 +53,9 @@ sed -i 's/120/600/' test/meson.build
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%changelog %changelog
* Fri Feb 03 2023 zhangpan <zhangpan@h-partners.com> - 0.42.2-1
- update to 0.42.2
* Tue Nov 08 2022 wangkerong <wangkerong@h-partners.com> - 0.40.0-3 * Tue Nov 08 2022 wangkerong <wangkerong@h-partners.com> - 0.40.0-3
- fix CVE-2022-44638 - fix CVE-2022-44638