aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-09-22 21:21:29 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-09-22 21:21:29 +0000
commitb828a6e09d614f5db64c06fe09d32b343a1159a6 (patch)
treefaed71e8cee3e3f4c14777963bb9a61edc52aa6c /epan/dissectors
parentd3b3e5fe16483e1b9db83e6b4abdb6a439e3d33d (diff)
bugfix: don't crash, if pinfo->match_string == NULL
svn path=/trunk/; revision=15969
Diffstat (limited to 'epan/dissectors')
-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"));
}
}