osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

If either of the "tvb_new_subset()" calls throws an exception, it means 

we don't have so much data in the frame that there's a trailer, so we
should set "trailer_tvb" to NULL.

Put in a comment explaining what the exception catching is all about.

svn path=/trunk/; revision=2632
This commit is contained in:
Guy Harris 2000-11-13 05:22:58 +00:00
parent f9546764f0
commit ee5b7e05ff
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packet-vlan.c
View File

@ -1,7 +1,7 @@
/* packet-vlan.c
* Routines for VLAN 802.1Q ethernet header disassembly
*
* $Id: packet-vlan.c,v 1.22 2000/11/13 04:44:14 guy Exp $
* $Id: packet-vlan.c,v 1.23 2000/11/13 05:22:58 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -114,7 +114,25 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
trailer_tvb = tvb_new_subset(tvb, 4 + encap_proto, -1, -1);
}
CATCH2(BoundsError, ReportedBoundsError) {
/* Either:
the packet doesn't have "encap_proto" bytes worth of
captured data left in it - or it may not even have
"encap_proto" bytes worth of data in it, period -
so the "tvb_new_subset()" creating "next_tvb"
threw an exception
or
the packet has exactly "encap_proto" bytes worth of
captured data left in it, so the "tvb_new_subset()"
creating "trailer_tvb" threw an exception.
In either case, this means that all the data in the frame
is within the length value, so we give all the data to the
next protocol and have no trailer. */
next_tvb = tvb_new_subset(tvb, 4, -1, encap_proto);
trailer_tvb = NULL;
}
ENDTRY;