osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

reassembly: Fix update to the fragment_add_single functions 

These used fragment_head and fragment_items indistinguishably
in a few ways. Fix up 4f3b028d94

Fix #18639. Fix #18640.
This commit is contained in:
John Thacker 2022-11-14 21:37:42 -05:00
parent 59fdaa7d07
commit b9a4bf297e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/reassemble.c
View File

@ -2394,7 +2394,7 @@ fragment_add_seq_single_work(reassembly_table *table, tvbuff_t *tvb,
for (frag_number=1; frag_number < max_frags; frag_number++) { for (frag_number=1; frag_number < max_frags; frag_number++) {
new_fh = lookup_fd_head(table, pinfo, id-frag_number, data, NULL); new_fh = lookup_fd_head(table, pinfo, id-frag_number, data, NULL);
if (new_fh != NULL) { if (new_fh != NULL) {
prev_fd = new_fh->next; prev_fd = NULL;
new_fh->frame = 0; new_fh->frame = 0;
for (fd=new_fh->next; fd && fd->offset < frag_number; fd=fd->next) { for (fd=new_fh->next; fd && fd->offset < frag_number; fd=fd->next) {
prev_fd = fd; prev_fd = fd;
@ -2404,6 +2404,8 @@ fragment_add_seq_single_work(reassembly_table *table, tvbuff_t *tvb,
} }
if (prev_fd) { if (prev_fd) {
prev_fd->next = NULL; prev_fd->next = NULL;
} else {
new_fh->next = NULL;
} }
break; break;
} }
@ -2474,7 +2476,7 @@ fragment_add_seq_single_work(reassembly_table *table, tvbuff_t *tvb,
} }
if (last) { if (last) {
/* Look for fragments past the end set by this Last fragment. */ /* Look for fragments past the end set by this Last fragment. */
prev_fd = fh->next; prev_fd = NULL;
for (fd=fh->next; fd && fd->offset <= frag_number; fd=fd->next) { for (fd=fh->next; fd && fd->offset <= frag_number; fd=fd->next) {
prev_fd = fd; prev_fd = fd;
} }
@ -2488,6 +2490,8 @@ fragment_add_seq_single_work(reassembly_table *table, tvbuff_t *tvb,
if (fd != NULL) { if (fd != NULL) {
if (prev_fd) { if (prev_fd) {
prev_fd->next = NULL; prev_fd->next = NULL;
} else {
fh->next = NULL;
} }
fh->frame = 0; fh->frame = 0;
for (prev_fd=fh->next; prev_fd; prev_fd=prev_fd->next) { for (prev_fd=fh->next; prev_fd; prev_fd=prev_fd->next) {