From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Mon, 3 Oct 2016 19:28:06 +0000 (-0400)
Subject: Merge pull request #653 in SNORT/snort3 from ~MIALTIZE/snort3:ftp-data-fix to master
X-Git-Tag: 3.0.0-233~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d0b08ba63cdd4504d3f472b302cfdb2372ec99e;p=thirdparty%2Fsnort3.git

Merge pull request #653 in SNORT/snort3 from ~MIALTIZE/snort3:ftp-data-fix to master

Squashed commit of the following:

commit 37521bfa269bcdb9d89cc08729ddd9f3714576a1
Author: Michael Altizer <mialtize@cisco.com>
Date:   Mon Oct 3 15:22:33 2016 -0400

    ftp_data: Gracefully handle cleared flow data
---

diff --git a/src/service_inspectors/ftp_telnet/ftp_data.cc b/src/service_inspectors/ftp_telnet/ftp_data.cc
index 7cfed7c8a..9f5bf70aa 100644
--- a/src/service_inspectors/ftp_telnet/ftp_data.cc
+++ b/src/service_inspectors/ftp_telnet/ftp_data.cc
@@ -88,11 +88,11 @@ static int SnortFTPData(Packet* p)
 
     FTP_DATA_SESSION* data_ssn = fd ? &fd->session : nullptr;
 
-    assert(PROTO_IS_FTP_DATA(data_ssn));
-
     if ( !data_ssn or (data_ssn->packet_flags & FTPDATA_FLG_STOP) )
         return 0;
 
+    assert(PROTO_IS_FTP_DATA(data_ssn));
+
     //  bail if we have not rebuilt the stream yet.
     if (!(p->packet_flags & PKT_REBUILT_STREAM))
         return 0;