stream raw reassembly fix

remotes/origin/HEAD
Anoop Saldanha 14 years ago committed by Victor Julien
parent db8500bb26
commit c5cc9d454d

@ -3213,8 +3213,8 @@ static int StreamTcpReassembleRaw (TcpReassemblyThreadCtx *ra_ctx,
smsg->data.seq = ra_base_seq+1; smsg->data.seq = ra_base_seq+1;
copy_size = sizeof(smsg->data.data) - smsg_offset; copy_size = sizeof(smsg->data.data) - smsg_offset;
if (copy_size > (seg->payload_len - payload_offset)) { if (copy_size > payload_len) {
copy_size = (seg->payload_len - payload_offset); copy_size = payload_len;
} }
if (SCLogDebugEnabled()) { if (SCLogDebugEnabled()) {
BUG_ON(copy_size > sizeof(smsg->data.data)); 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 */ /* 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_offset += copy_size;
payload_len -= copy_size; payload_len -= copy_size;

Loading…
Cancel
Save