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

[Stephan Bergmann]

 external/jpeg-turbo/ubsan.patch |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit e4e0eb0dffc229f7d2099f43644182bedceb6be2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 9 18:25:43 2016 +0100

    Use unit_least32_t as a better unsigned counterpart of INT32
    
    Change-Id: I0607073c73d3b291a4d5fbfb04e9516b9bbda748
    Reviewed-on: https://gerrit.libreoffice.org/22244
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/jpeg-turbo/ubsan.patch b/external/jpeg-turbo/ubsan.patch
index 46d718b..81ff148 100644
--- a/external/jpeg-turbo/ubsan.patch
+++ b/external/jpeg-turbo/ubsan.patch
@@ -1,11 +1,19 @@
 --- jcphuff.c
 +++ jcphuff.c
-@@ -255,7 +255,7 @@
+@@ -14,6 +14,7 @@
+  * suspension.
+  */
+ 
++#include <stdint.h>
+ #define JPEG_INTERNALS
+ #include "jinclude.h"
+ #include "jpeglib.h"
+@@ -255,7 +256,7 @@
      if (c == 0xFF) {            /* need to stuff a zero byte? */
        emit_byte(entropy, 0);
      }
 -    put_buffer <<= 8;
-+    put_buffer = (unsigned) put_buffer << 8;
++    put_buffer = (uint_least32_t) put_buffer << 8;
      put_bits -= 8;
    }