external/jpeg-turbo/ubsan.patch | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 88a3b813b5937dade3cdc36134170048a792cc5f
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jan 7 14:04:27 2015 +0100
external/jpeg-turbo: Work around -fsanitize=shift
Change-Id: I83bb6c2a208f2a80f227873b285c939ced6dbc27
diff --git a/external/jpeg-turbo/ubsan.patch b/external/jpeg-turbo/ubsan.patch
index fcd5bcf..e149d48 100644
--- a/external/jpeg-turbo/ubsan.patch
+++ b/external/jpeg-turbo/ubsan.patch
@@ -29,3 +29,12 @@
}
/* Completed MCU, so update state */
+@@ -402,7 +402,7 @@
+ r = GET_BITS(s);
+ s = HUFF_EXTEND(r, s);
+ /* Scale and output coefficient in natural (dezigzagged) order */
+- (*block)[jpeg_natural_order[k]] = (JCOEF) (s << Al);
++ (*block)[jpeg_natural_order[k]] = (JCOEF) ((unsigned)s << Al);
+ } else {
+ if (r == 15) { /* ZRL */
+ k += 15; /* skip 15 zeroes in band */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
