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

Signal-PDU: Bugfix false positive truncation warning with multiplexing 

This patch moves length check behind the multiplex check, so that we do
not get a false truncation warning, if other multiplex signals follow.
This commit is contained in:
Dr. Lars Völker 2021-10-28 16:03:49 +02:00 committed by Wireshark GitLab Utility
parent 0690da2456
commit 3d3a435903
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
epan/dissectors/packet-signal-pdu.c
View File

@ -1541,16 +1541,16 @@ dissect_spdu_payload_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
signal_length++;
}
if (tvb_captured_length_remaining(tvb, offset) < signal_length) {
expert_spdu_payload_truncated(tree, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset));
return -1;
}
if (item->multiplex_value_only != -1 && item->multiplex_value_only != *multiplexer) {
/* multiplexer set and we are in the wrong multiplex */
return 0;
}
if (tvb_captured_length_remaining(tvb, offset) < signal_length) {
expert_spdu_payload_truncated(tree, pinfo, tvb, offset, tvb_captured_length_remaining(tvb, offset));
return -1;
}
if (!spdu_derserializer_show_hidden && item->hidden) {
return (gint)item->bitlength_encoded_type;
}