From: Shivani Bhardwaj <shivani@oisf.net>
Date: Mon, 31 Oct 2022 13:23:06 +0000 (+0530)
Subject: util/base64: use padding var for calculations
X-Git-Tag: suricata-6.0.9~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8214%2Fhead;p=thirdparty%2Fsuricata.git

util/base64: use padding var for calculations

(cherry picked from commit 58e5033a44efcb163619dc95c67021e42a2c1e66)
---

diff --git a/src/util-base64.c b/src/util-base64.c
index fe5ed9b800..531dac3044 100644
--- a/src/util-base64.c
+++ b/src/util-base64.c
@@ -157,7 +157,7 @@ Base64Ecode DecodeBase64(uint8_t *dest, uint32_t dest_size, const uint8_t *src,
 
     if (!valid && mode == BASE64_MODE_RFC4648) {
         padding = B64_BLOCK - bbidx;
-        *decoded_bytes += ASCII_BLOCK - (B64_BLOCK - bbidx);
+        *decoded_bytes += ASCII_BLOCK - padding;
         DecodeBase64Block(dptr, b64);
         *consumed_bytes += bbidx;
     }