aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-fip.c
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2010-01-15 13:40:14 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2010-01-15 13:40:14 +0000
commit825589311426f68450b832d06efec71d3cf0b149 (patch)
tree687bec6b5085a77af31db93ca69c4f68214ff075 /epan/dissectors/packet-fip.c
parent4a38ad658c1f95ae8c63ba42aaae060d0682a9d5 (diff)
Change col_set_str() call to col_add_str() since the string being passed
can be a ep_alloc from val_to_str(). svn path=/trunk/; revision=31534
Diffstat (limited to 'epan/dissectors/packet-fip.c')
-rw-r--r--epan/dissectors/packet-fip.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 37226a292f..70b48dcc7a 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -264,6 +264,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
char *text;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIP");
+ col_clear(pinfo->cinfo, COL_INFO);
if (!tvb_bytes_exist(tvb, 0, FIP_HEADER_LEN)) {
col_set_str(pinfo->cinfo, COL_INFO, "[packet too short]");
@@ -294,7 +295,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
}
- col_set_str(pinfo->cinfo, COL_INFO, info);
+ col_add_str(pinfo->cinfo, COL_INFO, info);
rlen = tvb_get_ntohs(tvb, 6);