aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-media.c
diff options
context:
space:
mode:
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2005-09-22 21:21:29 +0000
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>2005-09-22 21:21:29 +0000
commit5bead0f3d2e8dd73a3abf0766aecce2e73a939f1 (patch)
treefaed71e8cee3e3f4c14777963bb9a61edc52aa6c /epan/dissectors/packet-media.c
parent18ed0673189d33c70a3604036ab690e7d454f973 (diff)
bugfix: don't crash, if pinfo->match_string == NULL
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15969 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-media.c')
-rw-r--r--epan/dissectors/packet-media.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c
index 726da7a292..d9b595b920 100644
--- a/epan/dissectors/packet-media.c
+++ b/epan/dissectors/packet-media.c
@@ -63,7 +63,7 @@ dissect_media(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree)
/* The media type has no parameters */
proto_tree_add_protocol_format(tree, proto_media, tvb, 0, bytes,
"Media Type: %s (%d byte%s)",
- pinfo->match_string,
+ pinfo->match_string ? pinfo->match_string : "",
bytes, plurality(bytes, "", "s"));
}
}