diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-03-04 21:05:21 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2008-03-04 21:05:21 +0000 |
| commit | bb323055b299c96b060f4d09ed4f6793a6f957f5 (patch) | |
| tree | b3280da4bedd09f3a32e75f7252628d3f4ca8caa /epan/dissectors/packet-ucp.c | |
| parent | 2da196a98bbcf5b2797b1ab2d4944575fb162821 (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.
svn path=/trunk/; revision=24557
Diffstat (limited to 'epan/dissectors/packet-ucp.c')
| -rw-r--r-- | epan/dissectors/packet-ucp.c | 2 |
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) |