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:
parent
0690da2456
commit
3d3a435903
|
@ -1541,16 +1541,16 @@ dissect_spdu_payload_signal(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
||||||
signal_length++;
|
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) {
|
if (item->multiplex_value_only != -1 && item->multiplex_value_only != *multiplexer) {
|
||||||
/* multiplexer set and we are in the wrong multiplex */
|
/* multiplexer set and we are in the wrong multiplex */
|
||||||
return 0;
|
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) {
|
if (!spdu_derserializer_show_hidden && item->hidden) {
|
||||||
return (gint)item->bitlength_encoded_type;
|
return (gint)item->bitlength_encoded_type;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue