]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
stream raw reassembly fix
authorAnoop Saldanha <poonaatsoc@gmail.com>
Mon, 28 May 2012 06:27:12 +0000 (11:57 +0530)
committerVictor Julien <victor@inliniac.net>
Wed, 20 Jun 2012 07:38:43 +0000 (09:38 +0200)
src/stream-tcp-reassemble.c

index 7624d35992aa08b017089fa7a58ef473fc910bbc..6b2157108994ff4fc4b5abb3976bc3990356ff16 100644 (file)
@@ -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;