aboutsummaryrefslogtreecommitdiff
path: root/src/liblzma/simple/armthumb.c
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2019-06-23 21:38:56 +0300
committerLasse Collin <lasse.collin@tukaani.org>2019-06-23 21:38:56 +0300
commitdfac2c9a1d7d4a2b8a5d7c9c6d567dee48318bcf (patch)
treea7f2f8d656bb83f7c6d31e292505d90ba1c980d1 /src/liblzma/simple/armthumb.c
parenttuklib_integer: Silence warnings from -Wsign-conversion. (diff)
downloadxz-dfac2c9a1d7d4a2b8a5d7c9c6d567dee48318bcf.tar.xz
liblzma: Fix warnings from -Wsign-conversion.
Also, more parentheses were added to the literal_subcoder macro in lzma_comon.h (better style but no functional change in the current usage).
Diffstat (limited to '')
-rw-r--r--src/liblzma/simple/armthumb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liblzma/simple/armthumb.c b/src/liblzma/simple/armthumb.c
index eab4862d..a8da334a 100644
--- a/src/liblzma/simple/armthumb.c
+++ b/src/liblzma/simple/armthumb.c
@@ -23,10 +23,10 @@ armthumb_code(void *simple lzma_attribute((__unused__)),
for (i = 0; i + 4 <= size; i += 2) {
if ((buffer[i + 1] & 0xF8) == 0xF0
&& (buffer[i + 3] & 0xF8) == 0xF8) {
- uint32_t src = ((buffer[i + 1] & 0x7) << 19)
- | (buffer[i + 0] << 11)
- | ((buffer[i + 3] & 0x7) << 8)
- | (buffer[i + 2]);
+ uint32_t src = (((uint32_t)(buffer[i + 1]) & 7) << 19)
+ | ((uint32_t)(buffer[i + 0]) << 11)
+ | (((uint32_t)(buffer[i + 3]) & 7) << 8)
+ | (uint32_t)(buffer[i + 2]);
src <<= 1;