pixman: Branch 'master' - 2 commits

[GitLab Mirror]

 configure.ac         |    2 +-
 meson.build          |    2 +-
 pixman/pixman-trap.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 37216a32839f59e8dcaa4c3951b3fcfc3f07852c
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Nov 2 12:11:10 2022 -0400

    Pre-release version bump to 0.42.2

diff --git a/configure.ac b/configure.ac
index 186a457..da950ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 42)
-m4_define([pixman_micro], 1)
+m4_define([pixman_micro], 2)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/meson.build b/meson.build
index 3d1f016..15bd4df 100644
--- a/meson.build
+++ b/meson.build
@@ -21,7 +21,7 @@
 project(
   'pixman',
   ['c'],
-  version : '0.42.1',
+  version : '0.42.2',
   license : 'MIT',
   meson_version : '>= 0.52.0',
   default_options : ['c_std=gnu99', 'buildtype=debugoptimized'],
commit a1f88e842e0216a5b4df1ab023caebe33c101395
Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Nov 2 12:07:32 2022 -0400

    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

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 */
 	}