From c5cc9d454d47bb1a3507c49e6c188e3f61a60c72 Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Mon, 28 May 2012 11:57:12 +0530 Subject: [PATCH] stream raw reassembly fix --- src/stream-tcp-reassemble.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c index 7624d35992..6b21571089 100644 --- a/src/stream-tcp-reassemble.c +++ b/src/stream-tcp-reassemble.c @@ -3213,8 +3213,8 @@ static int StreamTcpReassembleRaw (TcpReassemblyThreadCtx *ra_ctx, smsg->data.seq = ra_base_seq+1; copy_size = sizeof(smsg->data.data) - smsg_offset; - if (copy_size > (seg->payload_len - payload_offset)) { - copy_size = (seg->payload_len - payload_offset); + if (copy_size > payload_len) { + copy_size = payload_len; } if (SCLogDebugEnabled()) { BUG_ON(copy_size > sizeof(smsg->data.data)); @@ -3239,7 +3239,7 @@ static int StreamTcpReassembleRaw (TcpReassemblyThreadCtx *ra_ctx, } /* see if we have segment payload left to process */ - if ((copy_size + payload_offset) < seg->payload_len) { + if (copy_size < payload_len) { payload_offset += copy_size; payload_len -= copy_size;