root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tuklib_integer: Fix usage of conv macros. 

Use a temporary variable instead of e.g.
conv32le(unaligned_read32ne(buf)) because the macro can
evaluate its argument multiple times.
This commit is contained in:
Lasse Collin 2019-06-20 19:40:30 +03:00
parent b525b0c0ef
commit 3ce05d235f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/tuklib_integer.h
View File

@ -413,7 +413,8 @@ static inline uint16_t
unaligned_read16be(const uint8_t *buf) unaligned_read16be(const uint8_t *buf)
{ {
#if defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS) #if defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS)
return conv16be(unaligned_read16ne(buf)); uint16_t num = unaligned_read16ne(buf);
return conv16be(num);
#else #else
uint16_t num = ((uint16_t)buf[0] << 8) | (uint16_t)buf[1]; uint16_t num = ((uint16_t)buf[0] << 8) | (uint16_t)buf[1];
return num; return num;
@ -425,7 +426,8 @@ static inline uint16_t
unaligned_read16le(const uint8_t *buf) unaligned_read16le(const uint8_t *buf)
{ {
#if !defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS) #if !defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS)
return conv16le(unaligned_read16ne(buf)); uint16_t num = unaligned_read16ne(buf);
return conv16le(num);
#else #else
uint16_t num = ((uint16_t)buf[0]) | ((uint16_t)buf[1] << 8); uint16_t num = ((uint16_t)buf[0]) | ((uint16_t)buf[1] << 8);
return num; return num;
@ -437,7 +439,8 @@ static inline uint32_t
unaligned_read32be(const uint8_t *buf) unaligned_read32be(const uint8_t *buf)
{ {
#if defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS) #if defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS)
return conv32be(unaligned_read32ne(buf)); uint32_t num = unaligned_read32ne(buf);
return conv32be(num);
#else #else
uint32_t num = (uint32_t)buf[0] << 24; uint32_t num = (uint32_t)buf[0] << 24;
num |= (uint32_t)buf[1] << 16; num |= (uint32_t)buf[1] << 16;
@ -452,7 +455,8 @@ static inline uint32_t
unaligned_read32le(const uint8_t *buf) unaligned_read32le(const uint8_t *buf)
{ {
#if !defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS) #if !defined(WORDS_BIGENDIAN) || defined(TUKLIB_FAST_UNALIGNED_ACCESS)
return conv32le(unaligned_read32ne(buf)); uint32_t num = unaligned_read32ne(buf);
return conv32le(num);
#else #else
uint32_t num = (uint32_t)buf[0]; uint32_t num = (uint32_t)buf[0];
num |= (uint32_t)buf[1] << 8; num |= (uint32_t)buf[1] << 8;