Merging upstream version 4.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/epan/dissectors/packet-iso15765.c b/epan/dissectors/packet-iso15765.c
index bd3ff614..b27dc7ca 100644
--- a/epan/dissectors/packet-iso15765.c
+++ b/epan/dissectors/packet-iso15765.c
@@ -871,10 +871,17 @@ dissect_iso15765_can(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void*
         return 0;
     }
 
-    if (can_info.fd) {
+    switch (can_info.fd) {
+
+    case CAN_TYPE_CAN_FD:
         return dissect_iso15765(tvb, pinfo, tree, ISO15765_TYPE_CAN_FD, can_info.id, can_info.len);
-    } else {
+
+    case CAN_TYPE_CAN_CLASSIC:
         return dissect_iso15765(tvb, pinfo, tree, ISO15765_TYPE_CAN, can_info.id, can_info.len);
+
+    default:
+        DISSECTOR_ASSERT_NOT_REACHED();
+        return tvb_captured_length(tvb);
     }
 }