aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ucp.c
diff options
context:
space:
mode:
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2008-03-04 21:05:21 +0000
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>2008-03-04 21:05:21 +0000
commitf2adf2f819eb0254c051657455102b0b58ec51dd (patch)
treeb3280da4bedd09f3a32e75f7252628d3f4ca8caa /epan/dissectors/packet-ucp.c
parentc27497a106994c7330b40e9dad90e1390a96a580 (diff)
match_strval() may return NULL so don't blindly pass its return value into col_add_*() or proto_add_*(); use val_to_str() (returning "Unknown (%d)" if no match is found) instead.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24557 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-ucp.c')
-rw-r--r--epan/dissectors/packet-ucp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 8c2ede4daa..c9ccacf2ca 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -1713,7 +1713,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_clear(pinfo->cinfo, COL_INFO);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s (%s)",
val_to_str(OT, vals_hdr_OT, "unknown operation"),
- match_strval(O_R, vals_hdr_O_R));
+ val_to_str(O_R, vals_hdr_O_R, "Unknown (%d)"));
if (result == UCP_SHORTENED)
col_append_str(pinfo->cinfo, COL_INFO, " [short packet]");
else if (result == UCP_INV_CHK)