aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/rtp_player.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2011-07-14 19:51:53 +0000
committerBill Meier <wmeier@newsguy.com>2011-07-14 19:51:53 +0000
commit43806aff9d112c740a08edb963d7ab1220e1ab5c (patch)
tree13bf5e31cc9ab20cdf64fe273ad3cb06d4a473ab /gtk/rtp_player.c
parent092b161d042f402f1fa8e15f278d965f332e142c (diff)
Fix a crash when doing Telephony ! RTP ! Stream Analysis with capture files with truncated frames.
(That is: the capture files were created with a snapshot length less than the maximum). https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6120 svn path=/trunk/; revision=38023
Diffstat (limited to 'gtk/rtp_player.c')
-rw-r--r--gtk/rtp_player.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index 28fb21263e..9511eb117b 100644
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -403,7 +403,7 @@ add_rtp_packet(const struct _rtp_info *rtp_info, packet_info *pinfo)
memcpy(new_rtp_packet->info, rtp_info, sizeof(struct _rtp_info));
new_rtp_packet->arrive_offset = nstime_to_msec(&pinfo->fd->rel_ts) - stream_info->start_time;
/* copy the RTP payload to the rtp_packet to be decoded later */
- if (rtp_info->info_payload_len) {
+ if (rtp_info->info_all_data_present && (rtp_info->info_payload_len != 0)) {
new_rtp_packet->payload_data = g_malloc(rtp_info->info_payload_len);
memcpy(new_rtp_packet->payload_data, &(rtp_info->info_data[rtp_info->info_payload_offset]), rtp_info->info_payload_len);
} else {