Commit Graph

6 Commits

Author SHA1 Message Date
Guy Harris 6b629c4d92 Move show_exception() and show_reported_bounds_error() to
epan/show_exception.c, as it's used outside
epan/dissectors/packet-frame.c.  Update their callers to include
<epan/show_exception.h> to get their declaration.

Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if
there's more stuff in the packet to dissect after the dissector call
that threw the exception, doesn't mean you shouldn't go ahead and
dissect that stuff.  Use it in all those cases, including ones where
BoundsError was inappropriately being caught (you want those passed up
to the top level, so that the packet is reported as having been cut
short in the capture process).

Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that
correspond to running past the end of the data for a tvbuff; use it
rather than explicitly catching those exceptions individually, and
rather than just catching all exceptions (the only place that
DissectorError should be caught, for example, is at the top level, so
dissector bugs show up in the protocol tree).

Don't catch and then immediately rethrow exceptions without doing
anything else; just let the exceptions go up to the final catcher.

Use show_exception() to report non-fatal errors, rather than doing it
yourself.
 
If a dissector is called from Lua, catch all non-fatal errors and use
show_exception() to report them rather than catching only
ReportedBoundsError and adding a proto_malformed item.

Don't catch exceptions when constructing a trailer tvbuff in
packet-ieee8023.c - just construct it after the payload has been
dissected, and let whatever exceptions that throws be handled at the top
level.

Avoid some TRY/CATCH/ENDTRY cases by using checks such as
tvb_bytes_exist() before even looking in the tvbuff.

svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Pascal Quantin adfe9d3ced Fix a few 'value stored is never read' warnings and a typo error
svn path=/trunk/; revision=43714
2012-07-14 18:54:32 +00:00
Bill Meier 7320ebcfd9 Various minor cleanup, including:
- remove unneeded #includes;
- remove some unneeded initializers;
- use tvb_reported_length() instead of tvb_length();
- use  val_to_str_const() instead of val_to_str();
- fix some typos;
- do some whitespace changes and some reformatting.

svn path=/trunk/; revision=43707
2012-07-13 22:06:40 +00:00
Pascal Quantin 889ddbd9eb Fix compilation with gcc 4.3.2
svn path=/trunk/; revision=43572
2012-07-05 09:02:08 +00:00
Pascal Quantin d94492cc71 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7428 :
Add SPNEGO Extended Negotiation (NEGOEX) Security Mechanism dissector

svn path=/trunk/; revision=43569
2012-07-05 05:26:28 +00:00