diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-01-28 03:36:37 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-01-28 03:36:37 +0000 |
| commit | fa5b2237f9be11c3bc11a5a0e9cd2e3f3aece50e (patch) | |
| tree | a0998f2d04b2f4bb7c8a3b2a6126929021a5fe6f /packet-ethertype.c | |
| parent | 677db2dadd543ce432740304227ba5ab35ac1c7f (diff) | |
Catch any exceptions that add_ethernet_trailer() throws in add_dix_trailer().
Otherwise, they're caught by ethertype() which results in an infinite loop.
svn path=/trunk/; revision=9893
Diffstat (limited to 'packet-ethertype.c')
| -rw-r--r-- | packet-ethertype.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packet-ethertype.c b/packet-ethertype.c index 7df50ceda7..bb63134ff7 100644 --- a/packet-ethertype.c +++ b/packet-ethertype.c @@ -1,7 +1,7 @@ /* ethertype.c * Routines for calling the right protocol for the ethertype. * - * $Id: packet-ethertype.c,v 1.41 2003/11/27 21:09:42 guy Exp $ + * $Id: packet-ethertype.c,v 1.42 2004/01/28 03:36:37 gerald Exp $ * * Gilbert Ramirez <gram@alumni.rice.edu> * @@ -273,12 +273,12 @@ add_dix_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb, /* The packet doesn't have "length" bytes worth of captured data left in it. No trailer to display. */ trailer_tvb = NULL; + add_ethernet_trailer(fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); } ENDTRY; } else trailer_tvb = NULL; /* no trailer */ - add_ethernet_trailer(fh_tree, trailer_id, tvb, trailer_tvb, fcs_len); } void |