diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-02-01 17:31:23 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2018-02-01 18:20:12 +0000 |
| commit | 5c511d23e36b098c93ed1b3070a445c8e16185d2 (patch) | |
| tree | 590d447e38eb930e0b785d8e3c48078e0a5028cf | |
| parent | d7be8465b9defa2a54946892dbc389d222ad2d1f (diff) | |
RTP: ensure that bta2dp_info and btvdp_info are always initialized
Bug: 14380
Change-Id: Ib691b067f25d7281be2f6b4387552252d16d0064
Reviewed-on: https://code.wireshark.org/review/25550
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 24ee93a7d6..394d6311a3 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1237,10 +1237,13 @@ bluetooth_add_address(packet_info *pinfo, address *addr, guint32 stream_number, p_conv_data->rtp_conv_info->multisegment_pdus = wmem_tree_new(wmem_file_scope()); conversation_add_proto_data(p_conv, proto_rtp, p_conv_data); - if (media_types&RTP_MEDIA_AUDIO) + if (media_types == RTP_MEDIA_AUDIO) { p_conv_data->bta2dp_info = (bta2dp_codec_info_t *) wmem_memdup(wmem_file_scope(), data, sizeof(bta2dp_codec_info_t)); - if (media_types&RTP_MEDIA_VIDEO) + p_conv_data->btvdp_info = NULL; + } else if (media_types == RTP_MEDIA_VIDEO) { p_conv_data->btvdp_info = (btvdp_codec_info_t *) wmem_memdup(wmem_file_scope(), data, sizeof(btvdp_codec_info_t)); + p_conv_data->bta2dp_info = NULL; + } } /* |