diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 500296088..65b479f43 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -7508,13 +7508,17 @@ static int wc_EncryptedInfoParse(EncryptedInfo* info,
 
         if (start == NULL)
             return BUFFER_E;
-        if (start >= bufferEnd)
-            return BUFFER_E;
 
         /* skip dec-info and ": " */
         start += XSTRLEN(kDecInfoHeader);
-        if (start[0] == ':')
+        if (start >= bufferEnd)
+            return BUFFER_E;
+
+        if (start[0] == ':') {
             start++;
+            if (start >= bufferEnd)
+                return BUFFER_E;
+        }
         if (start[0] == ' ')
             start++;