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

GTK: Don't crash when we click on an RTP sample. 

This doesn't fix any of the underlying problems discussed in bug 10613
but it does keep us from dereferencing a NULL pointer.

Change-Id: I9317366a6ae6e563dcadb32bccee87e8803c37e3
Ping-Bug: 10613.
Reviewed-on: https://code.wireshark.org/review/9626
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-07-13 11:46:46 -07:00
parent 9f03aa131e
commit 8ba94798ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/gtk/rtp_player.c
View File

@ -896,7 +896,7 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
GtkAllocation widget_alloc;
cairo_t *cr;
if (!rci) return;
if (!rci || !pa_stream) return;
#if PORTAUDIO_API_1
idx = Pa_StreamTime( pa_stream ) - rtp_channels->pause_duration - rtp_channels->out_diff_time - start_index;
@ -2209,7 +2209,7 @@ decode_streams(void)
progbar_count = 0;
/* Mark the RTP streams to be played using the selected VoipCalls. If voip_calls is NULL
then this was called from "RTP Analysis" so mark all strams */
then this was called from "RTP Analysis" so mark all streams */
if (rtp_streams_hash) {
if (voip_calls)
g_hash_table_foreach( rtp_streams_hash, (GHFunc)mark_rtp_stream_to_play, NULL);