diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-17 20:51:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-17 20:51:35 +0000 |
| commit | 3618a128a603e620ffa59614f7cc4fe16facc40b (patch) | |
| tree | 7830bbad2a6d4d922b413d2e311d9194079481c3 /reassemble.c | |
| parent | 9ce0f18987817768284561205ecd597a2429d097 (diff) | |
Put in a missing check for fragment overlaps, and add an assertion to
check for bogus dfpos values before using the value.
svn path=/trunk/; revision=6447
Diffstat (limited to 'reassemble.c')
| -rw-r--r-- | reassemble.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/reassemble.c b/reassemble.c index ea75d8bc15..45e9cd1158 100644 --- a/reassemble.c +++ b/reassemble.c @@ -1,7 +1,7 @@ /* reassemble.c * Routines for {fragment,segment} reassembly * - * $Id: reassemble.c,v 1.23 2002/08/28 21:00:41 jmayer Exp $ + * $Id: reassemble.c,v 1.24 2002/10/17 20:51:35 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -723,8 +723,12 @@ fragment_add_seq_work(fragment_data *fd_head, tvbuff_t *tvb, int offset, } /* make sure it doesnt conflict with previous data */ dfpos=0; + last_fd=NULL; for (fd_i=fd_head->next;fd_i->offset!=fd->offset;fd_i=fd_i->next) { - dfpos += fd_i->len; + if (!last_fd || last_fd->offset!=fd_i->offset){ + dfpos += fd_i->len; + } + last_fd=fd_i; } if(fd_i->datalen!=fd->datalen){ fd->flags |= FD_OVERLAPCONFLICT; @@ -732,6 +736,7 @@ fragment_add_seq_work(fragment_data *fd_head, tvbuff_t *tvb, int offset, LINK_FRAG(fd_head,fd); return TRUE; } + g_assert(fd_head->len >= dfpos + fd->len); if ( memcmp(fd_head->data+dfpos, tvb_get_ptr(tvb,offset,fd->len),fd->len) ){ fd->flags |= FD_OVERLAPCONFLICT; |