osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Catch any exceptions that add_ethernet_trailer() throws in add_dix_trailer().

Browse source 
Otherwise, they're caught by ethertype() which results in an infinite loop.

svn path=/trunk/; revision=9893
This commit is contained in:
Gerald Combs 2004-01-28 03:36:37 +00:00
parent 677db2dadd
commit fa5b2237f9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packet-ethertype.c
View file

@ -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