diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-10-11 07:31:01 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-10-11 07:31:01 +0000 |
| commit | 8f73700b0b6572e08b08abeac063f09672349550 (patch) | |
| tree | fbdacb508471eb2cbcf3d85a16e0bdc3fbfdac36 /epan/dissectors/packet-media.c | |
| parent | 7b8d676e96ec764ace05b5f5dad5b71b120e17b2 (diff) | |
fix #1154: although g_vsnprintf() is called, it don't like a NULL pointer for a %s format string. The following proto_tree_add_text was already fixed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19489 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-media.c')
| -rw-r--r-- | epan/dissectors/packet-media.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-media.c b/epan/dissectors/packet-media.c index ef8310b1ce..ad7591ccc6 100644 --- a/epan/dissectors/packet-media.c +++ b/epan/dissectors/packet-media.c @@ -55,7 +55,7 @@ dissect_media(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree) /* Add media type to the INFO column if it is visible */ if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", pinfo->match_string); + col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", (pinfo->match_string) ? pinfo->match_string : ""); } if (tree) { |