aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2006-02-09 21:02:02 +0000
committerUlf Lamping <ulf.lamping@web.de>2006-02-09 21:02:02 +0000
commit48c4f86c90fda796b7881c8d36da09d2fa0d3f2f (patch)
treeea0a2cebe4b095aa30037c4292a93f172fc0065c /epan
parentbed77708feeca4543d0055ed3744fcaba22c5324 (diff)
fix# 733: don't crash on unknown msg_types
svn path=/trunk/; revision=17235
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-fix.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 133998245b..dd754a7968 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -868,8 +868,13 @@ dissect_fix(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (check_col(pinfo->cinfo, COL_INFO)) {
+ char *msg_type;
+
value = tvb_get_ephemeral_string(tvb, value_offset, value_len);
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", (char *)g_datalist_get_data(&msg_types, value));
+ msg_type = (char *)g_datalist_get_data(&msg_types, value);
+ if(msg_type) {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", msg_type);
+ }
}
/* In the interest of speed, if "tree" is NULL, don't do any work not