diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-07-24 00:59:06 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-07-24 08:00:39 +0000 |
| commit | 523e8c3cc549beacf99f5dbfb7e52c5e34ee85e2 (patch) | |
| tree | d3c621c750daebf3694bdfffd8aa6c205370d0c8 /epan/dissectors/packet-shim6.c | |
| parent | d109a8d62c39aa5caa29d9a2d021d813e82a7a12 (diff) | |
Pass the next header value to ipv6_dissect_next() as an argument.
That way, we don't rely on the ws_ip pointer being non-null.
Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac.
Bug: 12645
Change-Id: I8c74ba57637b6a125593c4711d7c21b9693c2c85
Reviewed-on: https://code.wireshark.org/review/16616
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-shim6.c')
| -rw-r--r-- | epan/dissectors/packet-shim6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-shim6.c b/epan/dissectors/packet-shim6.c index bca8102bba..2eec53576b 100644 --- a/epan/dissectors/packet-shim6.c +++ b/epan/dissectors/packet-shim6.c @@ -666,7 +666,7 @@ dissect_shim6(tvbuff_t *tvb, packet_info * pinfo, proto_tree *tree, void* data) iph->ip_nxt = shim.ip6s_nxt; iph->ip_len -= len; next_tvb = tvb_new_subset_remaining(tvb, len); - ipv6_dissect_next(next_tvb, pinfo, tree, iph); + ipv6_dissect_next(shim.ip6s_nxt, next_tvb, pinfo, tree, iph); return tvb_captured_length(tvb); } |