osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Reorganize handling of incomplete fragments slightly. The logic hasn't changed 

much, but I think this way's a little clearer, and it made it much easier to
figure out where the memory leak was.

Fixes the leaks from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9243

svn path=/trunk/; revision=52448
This commit is contained in:
Evan Huus 2013-10-08 15:05:45 +00:00
parent 8a9e9de7bf
commit 54c558fdfc
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/reassemble.c
View File

@ -1887,16 +1887,22 @@ fragment_add_seq_common(reassembly_table *table, tvbuff_t *tvb,
*/
if ((flags & REASSEMBLE_FLAGS_CHECK_DATA_PRESENT) &&
!tvb_bytes_exist(tvb, offset, frag_data_len)) {
if (!more_frags) {
/*
* Remove this from the table of in-progress
* reassemblies, and free up any memory used for
* it in that table.
*/
fragment_unhash(table, *orig_keyp);
}
fd_head -> flags |= FD_DATA_NOT_PRESENT;
return frag_number == 0 ? fd_head : NULL;
if (frag_number == 0) {
return fd_head;
}
else {
if (!more_frags) {
/*
* Remove this from the table of in-progress
* reassemblies, and free up any memory used for
* it in that table.
*/
fragment_unhash(table, *orig_keyp);
free_all_fragments(NULL, fd_head, NULL);
}
return NULL;
}
}
if (fragment_add_seq_work(fd_head, tvb, offset, pinfo,