kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1471 in FS/freeswitch from ~ANTONIO/freeswitch:bugfix/FS-10775-segfault-switch_frame_buffer_push to master 

* commit 'a0ae014dc130c97bac7d057ceabe84bcfb03fe7b':
  FS-10775 #resolve segfault switch_frame_buffer_push
This commit is contained in:
Mike Jerris 2018-05-04 14:32:45 +00:00
parent 8f10ae54a1 a0ae014dc1
commit d332efa6c9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/switch_core_media.c
View File

@ -1756,6 +1756,8 @@ SWITCH_DECLARE(void) switch_media_handle_destroy(switch_core_session_t *session)
switch_core_session_unset_write_codec(session); switch_core_session_unset_write_codec(session);
switch_core_media_deactivate_rtp(session); switch_core_media_deactivate_rtp(session);
if (a_engine->write_fb) switch_frame_buffer_destroy(&a_engine->write_fb);
if (smh->msrp_session) switch_msrp_session_destroy(&smh->msrp_session); if (smh->msrp_session) switch_msrp_session_destroy(&smh->msrp_session);
} }
@ -6760,7 +6762,6 @@ static void *SWITCH_THREAD_FUNC audio_write_thread(switch_thread_t *thread, void
mh->up = 0; mh->up = 0;
switch_mutex_unlock(smh->control_mutex); switch_mutex_unlock(smh->control_mutex);
switch_frame_buffer_destroy(&a_engine->write_fb);
switch_core_timer_destroy(&timer); switch_core_timer_destroy(&timer);
switch_core_session_rwunlock(session); switch_core_session_rwunlock(session);