From 55e19bfb89d9a5d55367a4535c470fd25a7a407a Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Tue, 28 Feb 2017 11:23:27 +0100 Subject: [PATCH] stream: more aggressive StreamReassembleRawHasDataReady --- src/stream-tcp-reassemble.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c index 6559024200..df208658ad 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -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; } -- 2.47.2