aboutsummaryrefslogtreecommitdiffstats
path: root/packet-llc.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-01-05 08:43:30 +0000
committerGuy Harris <guy@alum.mit.edu>2001-01-05 08:43:30 +0000
commitb31b5b697b271ab1e7bb8a7b0f5513ced2fe97d4 (patch)
treeeb88d7fd081edd6bd1ae8da085561f682c97af89 /packet-llc.c
parent40a0f2b3f052bb64b0782a879c3ead3cdbba316d (diff)
downloadwireshark-b31b5b697b271ab1e7bb8a7b0f5513ced2fe97d4.tar.gz
wireshark-b31b5b697b271ab1e7bb8a7b0f5513ced2fe97d4.tar.bz2
wireshark-b31b5b697b271ab1e7bb8a7b0f5513ced2fe97d4.zip
Clear the Info column before fetching anything from the packet, so that
if we throw an exception, the stuff from the protocol atop which LLC runs isn't still there. svn path=/trunk/; revision=2826
Diffstat (limited to 'packet-llc.c')
-rw-r--r--packet-llc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/packet-llc.c b/packet-llc.c
index 4d731e094d..67e590bff7 100644
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
* Routines for IEEE 802.2 LLC layer
* Gilbert Ramirez <gram@xiexie.org>
*
- * $Id: packet-llc.c,v 1.75 2001/01/03 10:34:41 guy Exp $
+ * $Id: packet-llc.c,v 1.76 2001/01/05 08:43:30 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@@ -284,6 +284,9 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if (check_col(pinfo->fd, COL_PROTOCOL)) {
col_set_str(pinfo->fd, COL_PROTOCOL, "LLC");
}
+ if (check_col(pinfo->fd, COL_INFO)) {
+ col_clear(pinfo->fd, COL_INFO);
+ }
dsap = tvb_get_guint8(tvb, 0);
if (tree) {