diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-07-24 01:21:26 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-07-24 08:22:07 +0000 |
| commit | 284aed2c66c63185da6af1a6636fb526e047d9ed (patch) | |
| tree | 0823284462515fec54212b8e5f55f30b17f1791b /epan/dissectors/packet-shim6.c | |
| parent | 00961a0df29a4e3b5f0541d48e5888fb13828e7b (diff) | |
More null "IP information" pointer checks.
Bug: 12645
Change-Id: Iac662bec3c23b0b3d228766ad7a094f615770072
Reviewed-on: https://code.wireshark.org/review/16618
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-shim6.c')
| -rw-r--r-- | epan/dissectors/packet-shim6.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/dissectors/packet-shim6.c b/epan/dissectors/packet-shim6.c index 2eec53576b..e439a2c5b4 100644 --- a/epan/dissectors/packet-shim6.c +++ b/epan/dissectors/packet-shim6.c @@ -663,8 +663,10 @@ dissect_shim6(tvbuff_t *tvb, packet_info * pinfo, proto_tree *tree, void* data) } } - iph->ip_nxt = shim.ip6s_nxt; - iph->ip_len -= len; + if (iph != NULL) { + iph->ip_nxt = shim.ip6s_nxt; + iph->ip_len -= len; + } next_tvb = tvb_new_subset_remaining(tvb, len); ipv6_dissect_next(shim.ip6s_nxt, next_tvb, pinfo, tree, iph); return tvb_captured_length(tvb); |