diff --git a/wolfcrypt/src/coding.c b/wolfcrypt/src/coding.c
index a35fd4356..18ef90752 100644
--- a/wolfcrypt/src/coding.c
+++ b/wolfcrypt/src/coding.c
@@ -122,13 +122,11 @@ static WC_INLINE int Base64_SkipNewline(const byte* in, word32 *inLen, word32 *o
     if (len == 0) {
         return BUFFER_E;
     }
+    curChar = in[j];
 
-    curChar = in[j++];
-    len--;
-
-    while (len && curChar == ' ') {
+    while (len > 1 && curChar == ' ') {
         /* skip whitespace in the middle or end of line */
-        curChar = in[j++];
+        curChar = in[++j];
         len--;
     }
     if (len && (curChar == '\r' || curChar == '\n')) {