diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-11-24 12:47:51 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-24 14:34:16 +0100 |
commit | c79afbe1b0db8aa2d810c3fa57dac902d973807f (patch) | |
tree | dbe914e7b6de2401a0d63fbd6eabc6c57dbcbc13 /external/cairo/pixman | |
parent | 8b8aa6bc010fffbcd47679aa101075d702741f69 (diff) |
ubsan: runtime error: left shift of 249 by 24 places
pixman-bits-image.c:309:20: runtime error: left shift of 249 by 24 places cannot be represented in type 'int'
Change-Id: I4f67752f7826225cd2175198084a29ac248b873f
Reviewed-on: https://gerrit.libreoffice.org/45226
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/cairo/pixman')
-rw-r--r-- | external/cairo/pixman/pixman-ubsan.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/external/cairo/pixman/pixman-ubsan.patch b/external/cairo/pixman/pixman-ubsan.patch index a26933b2398d..583706ae1764 100644 --- a/external/cairo/pixman/pixman-ubsan.patch +++ b/external/cairo/pixman/pixman-ubsan.patch @@ -20,3 +20,14 @@ next: vx += ux; +--- misc/pixman/pixman/pixman-bits-image.c ++++ misc/build/pixman/pixman/pixman-bits-image.c +@@ -306,7 +306,7 @@ + sgtot = CLIP (sgtot, 0, 0xff); + sbtot = CLIP (sbtot, 0, 0xff); + +- return ((satot << 24) | (srtot << 16) | (sgtot << 8) | (sbtot)); ++ return (((uint32_t)satot << 24) | (srtot << 16) | (sgtot << 8) | (sbtot)); + } + + static force_inline uint32_t |