diff options
| author | Sake Blok <sake@euronet.nl> | 2013-06-01 12:00:56 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2013-06-01 12:00:56 +0000 |
| commit | cf079d0a6c919e061cfc7ff4d316a3d6de0dc99c (patch) | |
| tree | a57531b00a65500992e25ed99c4950f90dbed3c0 | |
| parent | b2a6a6c15cd059bbf5ce83faaf611974f16158be (diff) | |
| download | wireshark-cf079d0a6c919e061cfc7ff4d316a3d6de0dc99c.tar.gz | |
Check on fh_tree is already done within add_ethernet_trailer()
svn path=/trunk/; revision=49676
| -rw-r--r-- | epan/dissectors/packet-eth.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index b605bc03bd..1e601a5bad 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -684,11 +684,9 @@ dissect_eth_maybefcs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fh_tree = dissect_eth_common(next_tvb, pinfo, tree, 0); /* Now handle the ethernet trailer and optional FCS */ - if ( fh_tree != NULL ) { - next_tvb = tvb_new_subset_remaining(tvb, tvb_length(tvb) - total_trailer_length); - add_ethernet_trailer(pinfo, tree, fh_tree, hf_eth_trailer, tvb, next_tvb, - eth_assume_fcs ? 4 : pinfo->pseudo_header->eth.fcs_len); - } + next_tvb = tvb_new_subset_remaining(tvb, tvb_length(tvb) - total_trailer_length); + add_ethernet_trailer(pinfo, tree, fh_tree, hf_eth_trailer, tvb, next_tvb, + eth_assume_fcs ? 4 : pinfo->pseudo_header->eth.fcs_len); } else { dissect_eth_common(tvb, pinfo, tree, eth_assume_fcs ? 4 : pinfo->pseudo_header->eth.fcs_len); } |