From: Daniil Kolomiiets -X (dkolomii - SOFTSERVE INC at Cisco) <dkolomii@cisco.com>
Date: Thu, 23 Oct 2025 20:05:04 +0000 (+0000)
Subject: Pull request #4942: pop: fixing oob in pop_paf search_for_command
X-Git-Tag: 3.9.7.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0013e2ee59c82e1de963bc7a4dd7250d0caa0196;p=thirdparty%2Fsnort3.git

Pull request #4942: pop: fixing oob in pop_paf search_for_command

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

Squashed commit of the following:

commit f06464862b154bd1742a19bdb330348519017da4
Author: Daniil Kolomiiets <dkolomii@cisco.com>
Date:   Wed Oct 15 11:35:39 2025 -0400

    pop: fixing oob in pop_paf search_for_command
---

diff --git a/src/service_inspectors/pop/pop_paf.cc b/src/service_inspectors/pop/pop_paf.cc
index 676d7efb8..cc0607259 100644
--- a/src/service_inspectors/pop/pop_paf.cc
+++ b/src/service_inspectors/pop/pop_paf.cc
@@ -61,7 +61,7 @@ static bool search_for_command(PopPafData* pfdata, const uint8_t ch)
             return true;
         }
     }
-    else if (toupper(ch) == toupper(val) )
+    else if (toupper(ch) == toupper(val) && val != '\0')
     {
         pfdata->cmd_state.next_letter++;
     }