[Libreoffice-commits] core.git: external/cairo

[Stephan Bergmann (via logerrit)]

 external/cairo/pixman/pixman-ubsan.patch |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit f57e30eb56c1b593dcb9e801202ded9d079d9043
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Wed Oct 28 08:25:13 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Oct 28 10:44:09 2020 +0100

    external/cairo: Fix another UBSan invalid-shift-base
    
    > pixman-utils.c:217:14: runtime error: left shift of 155 by 24 places cannot be represented in type 'int'
    
    ...which happened once while using the LO GUI
    
    Change-Id: I174a29e240f09576859308ada56fe240881f0dad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104915
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/cairo/pixman/pixman-ubsan.patch b/external/cairo/pixman/pixman-ubsan.patch
index 4455d4a324e8..8f68d569e117 100644
--- a/external/cairo/pixman/pixman-ubsan.patch
+++ b/external/cairo/pixman/pixman-ubsan.patch
@@ -183,3 +183,14 @@
  	w--;
      }
  
+--- misc/pixman/pixman/pixman-utils.c
++++ misc/build/pixman/pixman/pixman-utils.c
+@@ -214,7 +214,7 @@
+ 	g = float_to_unorm (src[i].g, 8);
+ 	b = float_to_unorm (src[i].b, 8);
+ 
+-	dst[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0);
++	dst[i] = ((uint32_t)a << 24) | (r << 16) | (g << 8) | (b << 0);
+     }
+ }
+