]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
stream: more aggressive StreamReassembleRawHasDataReady
authorVictor Julien <victor@inliniac.net>
Tue, 28 Feb 2017 10:23:27 +0000 (11:23 +0100)
committerVictor Julien <victor@inliniac.net>
Thu, 20 Apr 2017 15:41:11 +0000 (17:41 +0200)
src/stream-tcp-reassemble.c

index 6559024200ca7e13cd45b8cd66f2b3c234e78d5a..df208658adf77c953c502fc9c6764cd6744882b1 100644 (file)
@@ -1221,10 +1221,17 @@ bool StreamReassembleRawHasDataReady(TcpSession *ssn, Packet *p)
         stream = &ssn->server;
     }
 
+    if (stream->seg_list == NULL) {
+        return false;
+    }
+
     if (stream->flags & STREAMTCP_STREAM_FLAG_NOREASSEMBLY)
         return false;
 
     if (StreamTcpInlineMode() == FALSE) {
+        if ((STREAM_RAW_PROGRESS(stream) == STREAM_BASE_OFFSET(stream) + stream->sb.buf_offset)) {
+            return false;
+        }
         if (StreamTcpReassembleRawCheckLimit(ssn, stream, p) == 1) {
             return true;
         }