[Libreoffice-commits] core.git: external/jpeg-turbo

[Stephan Bergmann]

 external/jpeg-turbo/ubsan.patch |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit 874734c95c087dcc5373599c6f0d8fe71008b00c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 7 16:33:17 2015 +0100

    external/jpeg-turbo: Work around -fsanitize=shift
    
    Change-Id: I214ecae8c746235d31bfee9ae6adf65fa29ba68b

diff --git a/external/jpeg-turbo/ubsan.patch b/external/jpeg-turbo/ubsan.patch
index e149d48..9e90fe1 100644
--- a/external/jpeg-turbo/ubsan.patch
+++ b/external/jpeg-turbo/ubsan.patch
@@ -38,3 +38,12 @@
  	} else {
  	  if (r == 15) {	/* ZRL */
  	    k += 15;		/* skip 15 zeroes in band */
+@@ -494,7 +494,7 @@
+   phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
+   int Se = cinfo->Se;
+   int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
+-  int m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
++  int m1 = (unsigned)-1 << cinfo->Al;	/* -1 in the bit position being coded */
+   register int s, k, r;
+   unsigned int EOBRUN;
+   JBLOCKROW block;