diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-02-09 18:25:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-02-10 07:03:43 +0000 |
| commit | e4e0eb0dffc229f7d2099f43644182bedceb6be2 (patch) | |
| tree | 51e5af65a5fbd757a22babf9d3027c6e2ccf25e8 /external/jpeg-turbo | |
| parent | 5384c6a53a8f2201d373e8c63c42d39d10ad0aa6 (diff) | |
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@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/jpeg-turbo')
| -rw-r--r-- | external/jpeg-turbo/ubsan.patch | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/external/jpeg-turbo/ubsan.patch b/external/jpeg-turbo/ubsan.patch index 46d718bdd6b4..81ff148c57d6 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; } |