kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_rtp_asterisk: Re-order RTP destruction.

Browse Source 
The destructor for RTP deallocated transport resources
before terminating the ICE support. This could result
in a crash as the thread handling ICE would access already
freed parts of the RTP data.

This change re-orders the destruction so that ICE is
stopped before destroying things.

ASTERISK-28885

Change-Id: Ie71add549f12b6cdea7e9dbf976d1bd1d2fc0bdc
This commit is contained in:
Joshua C. Colp
2020-05-31 19:10:29 -03:00
committed by Friendly Automation
parent 81b86702fb
commit e7f7c8c9de
1 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
res/res_rtp_asterisk.c
View File

@@ -3429,39 +3429,6 @@ static int ast_rtp_destroy(struct ast_rtp_instance *instance)
ast_rtp_dtls_stop(instance); ast_rtp_dtls_stop(instance);
#endif #endif
/* Destroy the smoother that was smoothing out audio if present */
if (rtp->smoother) {
ast_smoother_free(rtp->smoother);
}
/* Close our own socket so we no longer get packets */
if (rtp->s > -1) {
close(rtp->s);
}
/* Destroy RTCP if it was being used */
if (rtp->rtcp) {
/*
* It is not possible for there to be an active RTCP scheduler
* entry at this point since it holds a reference to the
* RTP instance while it's active.
*/
if (rtp->rtcp->s > -1 && rtp->s != rtp->rtcp->s) {
close(rtp->rtcp->s);
}
ast_free(rtp->rtcp->local_addr_str);
ast_free(rtp->rtcp);
}
/* Destroy RED if it was being used */
if (rtp->red) {
ao2_unlock(instance);
AST_SCHED_DEL(rtp->sched, rtp->red->schedid);
ao2_lock(instance);
ast_free(rtp->red);
rtp->red = NULL;
}
#ifdef HAVE_PJPROJECT #ifdef HAVE_PJPROJECT
pj_thread_register_check(); pj_thread_register_check();
@@ -3519,6 +3486,39 @@ static int ast_rtp_destroy(struct ast_rtp_instance *instance)
} }
#endif #endif
/* Destroy the smoother that was smoothing out audio if present */
if (rtp->smoother) {
ast_smoother_free(rtp->smoother);
}
/* Close our own socket so we no longer get packets */
if (rtp->s > -1) {
close(rtp->s);
}
/* Destroy RTCP if it was being used */
if (rtp->rtcp) {
/*
* It is not possible for there to be an active RTCP scheduler
* entry at this point since it holds a reference to the
* RTP instance while it's active.
*/
if (rtp->rtcp->s > -1 && rtp->s != rtp->rtcp->s) {
close(rtp->rtcp->s);
}
ast_free(rtp->rtcp->local_addr_str);
ast_free(rtp->rtcp);
}
/* Destroy RED if it was being used */
if (rtp->red) {
ao2_unlock(instance);
AST_SCHED_DEL(rtp->sched, rtp->red->schedid);
ao2_lock(instance);
ast_free(rtp->red);
rtp->red = NULL;
}
ao2_cleanup(rtp->lasttxformat); ao2_cleanup(rtp->lasttxformat);
ao2_cleanup(rtp->lastrxformat); ao2_cleanup(rtp->lastrxformat);
ao2_cleanup(rtp->f.subclass.format); ao2_cleanup(rtp->f.subclass.format);