diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-04 21:05:21 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-03-04 21:05:21 +0000 |
| commit | f2adf2f819eb0254c051657455102b0b58ec51dd (patch) | |
| tree | b3280da4bedd09f3a32e75f7252628d3f4ca8caa /epan/dissectors/packet-dlsw.c | |
| parent | c27497a106994c7330b40e9dad90e1390a96a580 (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-dlsw.c')
| -rw-r--r-- | epan/dissectors/packet-dlsw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index e67d760419..350e303875 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -317,9 +317,9 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Explorer message: yes", "Explorer message: no")); proto_tree_add_text (dlsw_header_tree,tvb, 22,1,"Circuit priority = %s", - match_strval((tvb_get_guint8(tvb,22)&7),dlsw_pri_vals)) ; + val_to_str((tvb_get_guint8(tvb,22)&7),dlsw_pri_vals, "Unknown (%d)")) ; proto_tree_add_text (dlsw_header_tree,tvb, 23,1,"Old message type = %s (0x%02x)", - val_to_str(tvb_get_guint8(tvb,23) , dlsw_type_vals, "Unknown Type"), + val_to_str(tvb_get_guint8(tvb,23) , dlsw_type_vals, "Unknown Type"), tvb_get_guint8(tvb,23)); proto_tree_add_text (dlsw_header_tree,tvb, 24,6,"Target MAC Address = %s",tvb_bytes_to_str(tvb,24,6)) ; proto_tree_add_text (dlsw_header_tree,tvb, 30,6,"Origin MAC Address = %s",tvb_bytes_to_str(tvb,30,6)) ; |