Project

General

Profile

Download (3.69 KB)

Bug #140 » 0001-fixed-the-bug-140-caused-by-the-out-of-range-int32.patch

Gurvinder Singh, 05/03/2010 10:36 PM

View differences:

src/stream-tcp-reassemble.c
SCLogDebug("seg %10"PRIu32" len %" PRIu16 ", seg %p, prev %p, next %p",
seg->seq, seg->payload_len, seg, seg->prev, seg->next);
if (seg->prev != NULL && SEQ_LT(seg->seq,seg->prev->seq)) {
SCLogDebug("inconsistant list: SEQ_LT(seg->seq,seg->prev->seq)) =="
" TRUE, seg->seq %" PRIu32 ", seg->prev->seq %" PRIu32 ""
"", seg->seq, seg->prev->seq);
if (seg->prev != NULL && SEQ_GT(seg->prev->seq,seg->seq)) {
SCLogDebug("inconsistant list: SEQ_GT(seg->prev->seq,seg->seq)) == "
"TRUE, seg->prev->seq %" PRIu32 ", seg->seq %" PRIu32 "",
seg->prev->seq, seg->seq);
}
if (SEQ_LT(seg->seq,next_seq)) {
......
SCLogDebug("seg %10"PRIu32" len %" PRIu16 ", seg %p, prev %p, next %p",
seg->seq, seg->payload_len, seg, seg->prev, seg->next);
if (seg->prev != NULL && SEQ_LT(seg->seq,seg->prev->seq)) {
SCLogDebug("inconsistant list: SEQ_LT(seg->seq,seg->prev->seq)) == "
"TRUE, seg->seq %" PRIu32 ", seg->prev->seq %" PRIu32 "",
seg->seq, seg->prev->seq);
if (seg->prev != NULL && SEQ_GT(seg->prev->seq,seg->seq)) {
SCLogDebug("inconsistant list: SEQ_GT(seg->prev->seq,seg->seq)) == "
"TRUE, seg->prev->seq %" PRIu32 ", seg->seq %" PRIu32 "",
seg->prev->seq, seg->seq);
PrintList2(head_seg);
abort();
}
src/stream-tcp.c
SCLogDebug("ssn %p: ssn->server.window %"PRIu32"", ssn,
ssn->server.window);
if (SEQ_GT(TCP_GET_ACK(p), ssn->server.last_ack))
if (SEQ_GT(TCP_GET_ACK(p), ssn->server.last_ack)) {
SCLogDebug("ssn %p: ssn->server.last_ack %"PRIu32", updated "
"ssn->server.last_ack %" PRIu32 "", ssn, ssn->server.last_ack,
TCP_GET_ACK(p));
ssn->server.last_ack = TCP_GET_ACK(p);
}
if (SEQ_GT((ssn->server.last_ack + ssn->server.window),
ssn->server.next_win))
......
SCLogDebug("ssn %p: ssn->client.window %"PRIu32"", ssn,
ssn->client.window);
if (SEQ_GT(TCP_GET_ACK(p), ssn->client.last_ack))
if (SEQ_GT(TCP_GET_ACK(p), ssn->client.last_ack)){
SCLogDebug("ssn %p: ssn->client.last_ack %"PRIu32", updated "
"ssn->client.last_ack %" PRIu32 "", ssn, ssn->client.last_ack,
TCP_GET_ACK(p));
ssn->client.last_ack = TCP_GET_ACK(p);
}
if (SEQ_GT((ssn->client.last_ack + ssn->client.window),
ssn->client.next_win))
(2-2/2)