Clear the Info column before fetching anything from the packet, so that
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 5 Jan 2001 08:59:16 +0000 (08:59 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Fri, 5 Jan 2001 08:59:16 +0000 (08:59 +0000)
if we throw an exception, the stuff from the Token-Ring protocol isn't
still there.

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

packet-trmac.c

index 8c1da0ddf44bb8892d63f9a2bd84f93fda2d52e7..6cd61d9e8c7fc69c3d2afba92cf923e3f04591cb 100644 (file)
@@ -2,7 +2,7 @@
  * Routines for Token-Ring Media Access Control
  * Gilbert Ramirez <gram@xiexie.org>
  *
  * Routines for Token-Ring Media Access Control
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-trmac.c,v 1.28 2001/01/03 10:34:42 guy Exp $
+ * $Id: packet-trmac.c,v 1.29 2001/01/05 08:59:16 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -285,6 +285,8 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        pinfo->current_proto = "TR MAC";
        if (check_col(pinfo->fd, COL_PROTOCOL))
                col_set_str(pinfo->fd, COL_PROTOCOL, "TR MAC");
        pinfo->current_proto = "TR MAC";
        if (check_col(pinfo->fd, COL_PROTOCOL))
                col_set_str(pinfo->fd, COL_PROTOCOL, "TR MAC");
+       if (check_col(pinfo->fd, COL_INFO))
+               col_clear(pinfo->fd, COL_INFO);
 
        mv_val = tvb_get_guint8(tvb, 3);
 
 
        mv_val = tvb_get_guint8(tvb, 3);