aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kaiser <wireshark@kaiser.cx>2012-10-18 20:57:02 +0000
committerMartin Kaiser <wireshark@kaiser.cx>2012-10-18 20:57:02 +0000
commit05c1e47f68b609702ec13a09e5ebc1a572841e12 (patch)
treee58268c9d387b9cf141b416a680cddc939390fe4
parent8bf29e8efed9c08ed21fabcb486bf7e9aaebaa83 (diff)
(try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7871
increment offset to point to the first byte after the options (the code used to set an absolute position, if that was 0, we were stuck in an endless loop) svn path=/trunk/; revision=45646
-rw-r--r--epan/dissectors/packet-clnp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index d6131d2e2a..23da6c8606 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -418,7 +418,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
tvb, offset, clnp_tree );
}
- offset = cnf_hdr_len;
+ offset += opt_len;
/* If clnp_reassemble is on, this is a segment, we have all the
* data in the segment, and the checksum is valid, then just add the