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

TECMP: Fix CRC decoding on FlexRay Null Frames (Bugfix) 

Skipping FlexRay Null Frame Payload to avoid bogus CRC values.
This commit is contained in:
Dr. Lars Völker 2022-07-19 23:33:53 +02:00 committed by A Wireshark GitLab Utility
parent 54b4be9015
commit 90ac880b8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-tecmp.c
View File

@ -1566,11 +1566,11 @@ dissect_tecmp_log_or_replay_stream(tvbuff_t *tvb, packet_info *pinfo, proto_tree
length2 = MAX(0, MIN((gint)length2, tvb_captured_length_remaining(sub_tvb, offset2)));
}
if ((dataflags & DATA_FLAG_FR_NF) == 0 && length2 > 0) {
if (length2 > 0) {
payload_tvb = tvb_new_subset_length(sub_tvb, offset2, length2);
offset2 += length2;
if (!flexray_call_subdissectors(payload_tvb, pinfo, tree, &fr_info, heuristic_first)) {
if ((dataflags & DATA_FLAG_FR_NF) != 0 && !flexray_call_subdissectors(payload_tvb, pinfo, tree, &fr_info, heuristic_first)) {
dissect_data(payload_tvb, pinfo, tree, device_id, tecmp_msg_type, data_type, interface_id);
}
}