osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Pascal Quantin 2018-02-01 17:31:23 +01:00 committed by Michael Mann
parent d7be8465b9
commit 5c511d23e3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-rtp.c
View File

@ -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;
}
}
/*