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 7cfed7c8abca87c1cdfab3a5247b9c93b9f769b7..9f5bf70aa1bbdd600e9765a54cf1ef7c4c475d79 100644 (file)
--- 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;