diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-02-08 07:06:55 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-02-08 07:06:55 +0000 |
| commit | b1eb3635c2806bcadeb02fea81b9874d30f79c99 (patch) | |
| tree | 15385c21200246a9f24781757b8841161c7db233 | |
| parent | 1f26489d9e07a487333ca674065b3c4442f54381 (diff) | |
| download | wireshark-b1eb3635c2806bcadeb02fea81b9874d30f79c99.tar.gz wireshark-b1eb3635c2806bcadeb02fea81b9874d30f79c99.tar.bz2 wireshark-b1eb3635c2806bcadeb02fea81b9874d30f79c99.zip | |
In "call_dissector()", if the protocol for the dissector referred to by
the handle has been disabled, return after calling "dissect_data()",
rather than driving on and calling the dissector anyway.
svn path=/trunk/; revision=3001
| -rw-r--r-- | epan/packet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c index 05c4b554ef..4553188d28 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1,7 +1,7 @@ /* packet.c * Routines for packet disassembly * - * $Id: packet.c,v 1.19 2001/02/01 07:34:30 guy Exp $ + * $Id: packet.c,v 1.20 2001/02/08 07:06:55 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -2015,6 +2015,7 @@ call_dissector(dissector_handle_t handle, tvbuff_t *tvb, * No - just dissect this packet as data. */ dissect_data(tvb, 0, pinfo, tree); + return; } saved_proto = pinfo->current_proto; |