From b31b5b697b271ab1e7bb8a7b0f5513ced2fe97d4 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 5 Jan 2001 08:43:30 +0000 Subject: [PATCH] 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 --- packet-llc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 * - * $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 @@ -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) {