From ff1dd3e9a13cd93adb4f8c1d8c93739d17dd7f41 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 7 Dec 2014 22:02:57 +0200 Subject: [PATCH] base64: Try to avoid static analyzer warning (part 2) Shift right on unsigned char limits the value to 0..63 which is within bounds for base64_table[]. Anyway, some static analyzers do not seem to understand that. See if an otherwise unnecessary masking gets rid of false warnings. (CID 62858) Signed-off-by: Jouni Malinen --- src/utils/base64.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/utils/base64.c b/src/utils/base64.c index 7366c30d3..d44f290e5 100644 --- a/src/utils/base64.c +++ b/src/utils/base64.c @@ -63,14 +63,14 @@ unsigned char * base64_encode(const unsigned char *src, size_t len, } if (end - in) { - *pos++ = base64_table[in[0] >> 2]; + *pos++ = base64_table[(in[0] >> 2) & 0x3f]; if (end - in == 1) { - *pos++ = base64_table[(in[0] & 0x03) << 4]; + *pos++ = base64_table[((in[0] & 0x03) << 4) & 0x3f]; *pos++ = '='; } else { - *pos++ = base64_table[((in[0] & 0x03) << 4) | - (in[1] >> 4)]; - *pos++ = base64_table[(in[1] & 0x0f) << 2]; + *pos++ = base64_table[(((in[0] & 0x03) << 4) | + (in[1] >> 4)) & 0x3f]; + *pos++ = base64_table[((in[1] & 0x0f) << 2) & 0x3f]; } *pos++ = '='; line_len += 4;