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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2826 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packet-llc.c b/packet-llc.c
index 4d731e094da6a0cea1575e8b313ae5740a381262..67e590bff74dc25243a9509f10d8bd020501fd2c 100644 (file)
--- 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) {