Merging upstream version 4.2.6.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/epan/dissectors/packet-wisun.c b/epan/dissectors/packet-wisun.c
index e0a6d34a..6985a784 100644
--- a/epan/dissectors/packet-wisun.c
+++ b/epan/dissectors/packet-wisun.c
@@ -849,6 +849,7 @@ dissect_wisun_luttie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint
 static int
 dissect_wisun_nrie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guint offset)
 {
+    guint start_offset = offset;
     guint8 node_role = tvb_get_guint8(tvb, offset) & WISUN_WSIE_NODE_ROLE_MASK;
 
     proto_tree_add_item(tree, hf_wisun_nrie_nr_id, tvb, offset, 1, ENC_LITTLE_ENDIAN);
@@ -869,7 +870,7 @@ dissect_wisun_nrie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, guin
         offset += 3;
     }
 
-    return offset;
+    return offset - start_offset;
 }
 
 static int
@@ -1382,7 +1383,7 @@ dissect_wisun_pomie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, voi
     proto_item *item;
     proto_tree *subtree;
     guint8 number_operating_modes;
-    guint8 offset = 0;
+    guint offset = 0;
 
     static int* const wisun_pomie_fields[] = {
         &hf_wisun_pomie_number_operating_modes,
@@ -1499,7 +1500,7 @@ dissect_wisun_jmie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void
         &hf_wisun_jmie_metric_len,
         NULL
     };
-    guint8 offset = 0;
+    guint offset = 0;
     proto_item *item;
     proto_tree *subtree;