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

ppp: Check to see if process_reassembled_data gave us a tvbuffer 

It's possible to have multiplexed PPP MP that occurs in several
layers in the same frame, so we need to check that we're in the
right packet and also the right layer. process_reassembled_data
does that, so check to see if it returned a tvb instead of
just checking the frame number. Prevents some DISSECTOR BUG errors
when the buffer isn't actually available.
This commit is contained in:
John Thacker 2022-11-14 21:41:25 -05:00
parent 1a04473ca8
commit 03a4eed570
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ppp.c
View File

@ -5789,7 +5789,7 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
NULL, mp_tree);
if (frag_mp) {
if (pinfo->num == frag_mp->reassembled_in) {
if (next_tvb) {
dissect_ppp(next_tvb, pinfo, tree, NULL);
} else {
col_append_fstr(pinfo->cinfo, COL_INFO,