From e89efdece96dc292a96bb5aef07e05261e38616c Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 12 Feb 2025 14:31:45 +0100 Subject: [PATCH] [winpr] add WINPR_ATTR_UNUSED --- winpr/include/winpr/platform.h | 10 ++++++++++ 1 file changed, 10 insertions(+) Index: FreeRDP-3.10.3/winpr/include/winpr/platform.h =================================================================== --- FreeRDP-3.10.3.orig/winpr/include/winpr/platform.h +++ FreeRDP-3.10.3/winpr/include/winpr/platform.h @@ -595,4 +595,14 @@ WINPR_PRAGMA_DIAG_POP #define WINPR_UNUSED(x) (void)(x) +#if defined(__cplusplus) && (__cplusplus >= 201703L) +#define WINPR_ATTR_UNUSED [[maybe_unused]] /** @since version 3.12.0 */ +#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202000L) +#define WINPR_ATTR_UNUSED [[maybe_unused]] /** @since version 3.12.0 */ +#elif defined(__GNUC__) || defined(__clang__) +#define WINPR_ATTR_UNUSED __attribute__((unused)) /** @since version 3.12.0 */ +#else +#define WINPR_ATTR_UNUSED /** @since version 3.12.0 */ +#endif + #endif /* WINPR_PLATFORM_H */ Index: FreeRDP-3.10.3/libfreerdp/crypto/base64.c =================================================================== --- FreeRDP-3.10.3.orig/libfreerdp/crypto/base64.c +++ FreeRDP-3.10.3/libfreerdp/crypto/base64.c @@ -302,11 +302,11 @@ static const signed char dec_base64[] = -1, /* 127 177 7F 01111111 DEL  Delete */ }; -static INLINE char* base64_encode_ex(const BYTE* WINPR_RESTRICT alphabet, +static inline char* base64_encode_ex(const BYTE* WINPR_RESTRICT alphabet, + WINPR_ATTR_UNUSED size_t alphabetCount, const BYTE* WINPR_RESTRICT data, size_t length, BOOL pad, BOOL crLf, size_t lineSize) { - int c = 0; size_t blocks = 0; size_t outLen = (length + 3) * 4 / 3; size_t extra = 0; @@ -340,12 +340,21 @@ static INLINE char* base64_encode_ex(con blocks = length - (length % 3); for (size_t i = 0; i < blocks; i += 3, q += 3) { - c = (q[0] << 16) + (q[1] << 8) + q[2]; - - *p++ = alphabet[(c & 0x00FC0000) >> 18]; - *p++ = alphabet[(c & 0x0003F000) >> 12]; - *p++ = alphabet[(c & 0x00000FC0) >> 6]; - *p++ = alphabet[c & 0x0000003F]; + const unsigned c = ((unsigned)q[0] << 16) + ((unsigned)q[1] << 8) + q[2]; + const unsigned idx0 = (c & 0x00FC0000) >> 18; + const unsigned idx1 = (c & 0x0003F000) >> 12; + const unsigned idx2 = (c & 0x00000FC0) >> 6; + const unsigned idx3 = c & 0x0000003F; + + WINPR_ASSERT(idx0 < alphabetCount); + WINPR_ASSERT(idx1 < alphabetCount); + WINPR_ASSERT(idx2 < alphabetCount); + WINPR_ASSERT(idx3 < alphabetCount); + + *p++ = alphabet[idx0]; + *p++ = alphabet[idx1]; + *p++ = alphabet[idx2]; + *p++ = alphabet[idx3]; outCounter += 4; if (crLf && (outCounter % lineSize == 0)) @@ -361,23 +370,41 @@ static INLINE char* base64_encode_ex(con case 0: break; case 1: - c = (q[0] << 16); - *p++ = alphabet[(c & 0x00FC0000) >> 18]; - *p++ = alphabet[(c & 0x0003F000) >> 12]; + { + const unsigned c = ((unsigned)q[0] << 16); + const unsigned idx0 = (c & 0x00FC0000) >> 18; + const unsigned idx1 = (c & 0x0003F000) >> 12; + + WINPR_ASSERT(idx0 < alphabetCount); + WINPR_ASSERT(idx1 < alphabetCount); + + *p++ = alphabet[idx0]; + *p++ = alphabet[idx1]; if (pad) { *p++ = '='; *p++ = '='; } - break; + } + break; case 2: - c = (q[0] << 16) + (q[1] << 8); - *p++ = alphabet[(c & 0x00FC0000) >> 18]; - *p++ = alphabet[(c & 0x0003F000) >> 12]; - *p++ = alphabet[(c & 0x00000FC0) >> 6]; + { + const unsigned c = ((unsigned)q[0] << 16) + ((unsigned)q[1] << 8); + const unsigned idx0 = (c & 0x00FC0000) >> 18; + const unsigned idx1 = (c & 0x0003F000) >> 12; + const unsigned idx2 = (c & 0x00000FC0) >> 6; + + WINPR_ASSERT(idx0 < alphabetCount); + WINPR_ASSERT(idx1 < alphabetCount); + WINPR_ASSERT(idx2 < alphabetCount); + + *p++ = alphabet[idx0]; + *p++ = alphabet[idx1]; + *p++ = alphabet[idx2]; if (pad) *p++ = '='; - break; + } + break; default: break; } @@ -392,21 +419,23 @@ static INLINE char* base64_encode_ex(con return ret; } -static INLINE char* base64_encode(const BYTE* WINPR_RESTRICT alphabet, +static inline char* base64_encode(const BYTE* WINPR_RESTRICT alphabet, size_t alphabetCount, const BYTE* WINPR_RESTRICT data, size_t length, BOOL pad) { - return base64_encode_ex(alphabet, data, length, pad, FALSE, 64); + return base64_encode_ex(alphabet, alphabetCount, data, length, pad, FALSE, 64); } -static INLINE int base64_decode_char(const signed char* WINPR_RESTRICT alphabet, char c) +static inline int base64_decode_char(const signed char* WINPR_RESTRICT alphabet, + size_t alphabetCount, char c) { - if (c <= '\0') + const int ic = (int)c; + if ((ic <= 0) || ((size_t)ic >= alphabetCount)) return -1; return alphabet[(size_t)c]; } -static INLINE void* base64_decode(const signed char* WINPR_RESTRICT alphabet, +static inline void* base64_decode(const signed char* WINPR_RESTRICT alphabet, size_t alphabetCount, const char* WINPR_RESTRICT s, size_t length, size_t* WINPR_RESTRICT data_len, BOOL pad) { @@ -436,10 +465,10 @@ static INLINE void* base64_decode(const for (size_t i = 0; i < nBlocks - 1; i++, q += 3) { - n[0] = base64_decode_char(alphabet, *s++); - n[1] = base64_decode_char(alphabet, *s++); - n[2] = base64_decode_char(alphabet, *s++); - n[3] = base64_decode_char(alphabet, *s++); + n[0] = base64_decode_char(alphabet, alphabetCount, *s++); + n[1] = base64_decode_char(alphabet, alphabetCount, *s++); + n[2] = base64_decode_char(alphabet, alphabetCount, *s++); + n[3] = base64_decode_char(alphabet, alphabetCount, *s++); if ((n[0] == -1) || (n[1] == -1) || (n[2] == -1) || (n[3] == -1)) goto out_free; @@ -451,13 +480,13 @@ static INLINE void* base64_decode(const } /* treat last block */ - n[0] = base64_decode_char(alphabet, *s++); - n[1] = base64_decode_char(alphabet, *s++); + n[0] = base64_decode_char(alphabet, alphabetCount, *s++); + n[1] = base64_decode_char(alphabet, alphabetCount, *s++); if ((n[0] == -1) || (n[1] == -1)) goto out_free; - n[2] = remainder == 2 ? -1 : base64_decode_char(alphabet, *s++); - n[3] = remainder >= 2 ? -1 : base64_decode_char(alphabet, *s++); + n[2] = remainder == 2 ? -1 : base64_decode_char(alphabet, alphabetCount, *s++); + n[3] = remainder >= 2 ? -1 : base64_decode_char(alphabet, alphabetCount, *s++); q[0] = (BYTE)((n[0] << 2) + (n[1] >> 4)); if (n[2] == -1) @@ -497,27 +526,29 @@ out_free: char* crypto_base64_encode_ex(const BYTE* WINPR_RESTRICT data, size_t length, BOOL withCrLf) { - return base64_encode_ex(enc_base64, data, length, TRUE, withCrLf, 64); + return base64_encode_ex(enc_base64, ARRAYSIZE(enc_base64), data, length, TRUE, withCrLf, 64); } char* crypto_base64_encode(const BYTE* WINPR_RESTRICT data, size_t length) { - return base64_encode(enc_base64, data, length, TRUE); + return base64_encode(enc_base64, ARRAYSIZE(enc_base64), data, length, TRUE); } void crypto_base64_decode(const char* WINPR_RESTRICT enc_data, size_t length, BYTE** WINPR_RESTRICT dec_data, size_t* WINPR_RESTRICT res_length) { - *dec_data = base64_decode(dec_base64, enc_data, length, res_length, TRUE); + *dec_data = + base64_decode(dec_base64, ARRAYSIZE(dec_base64), enc_data, length, res_length, TRUE); } char* crypto_base64url_encode(const BYTE* WINPR_RESTRICT data, size_t length) { - return base64_encode(enc_base64url, data, length, FALSE); + return base64_encode(enc_base64url, ARRAYSIZE(enc_base64url), data, length, FALSE); } void crypto_base64url_decode(const char* WINPR_RESTRICT enc_data, size_t length, BYTE** WINPR_RESTRICT dec_data, size_t* WINPR_RESTRICT res_length) { - *dec_data = base64_decode(dec_base64url, enc_data, length, res_length, FALSE); + *dec_data = + base64_decode(dec_base64url, ARRAYSIZE(dec_base64url), enc_data, length, res_length, FALSE); }