From: Daniil Kolomiiets -X (dkolomii - SOFTSERVE INC at Cisco) <dkolomii@cisco.com>
Date: Thu, 23 Oct 2025 12:31:32 +0000 (+0000)
Subject: Pull request #4941: imap: parse_command oob fix
X-Git-Tag: 3.9.7.0~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa1b7e0c6e4cc097210353358649ef0c0b04f52e;p=thirdparty%2Fsnort3.git

Pull request #4941: imap: parse_command oob fix

Merge in SNORT/snort3 from ~DKOLOMII/snort3:imap_oob_fix to master

Squashed commit of the following:

commit fd69fd0e106da891013f471051c06cd357bba5ac
Author: Daniil Kolomiiets <dkolomii@cisco.com>
Date:   Wed Oct 15 10:12:23 2025 -0400

    imap: parse_command oob fix
---

diff --git a/src/service_inspectors/imap/imap_paf.cc b/src/service_inspectors/imap/imap_paf.cc
index 82da737e9..7e6a898c2 100644
--- a/src/service_inspectors/imap/imap_paf.cc
+++ b/src/service_inspectors/imap/imap_paf.cc
@@ -426,7 +426,7 @@ static inline void parse_command(const uint8_t ch, ImapPafData* pfdata)
                 : IMAP_PAF_VAL_STATE;
         }
     }
-    else if (toupper(ch) == toupper(val))
+    else if (toupper(ch) == toupper(val) && val != '\0')
         pfdata->imap_data_info.next_letter++;
 
     else