From 231c1d09f00beba8ed136656933dfccfe3a1a0ee Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 13 Sep 2006 14:31:55 +0000 Subject: [PATCH] fix rtp destroy race. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2678 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/endpoints/mod_sofia/mod_sofia.c | 1 - src/switch_rtp.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 84c16bff7a..b045a8df3a 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -649,7 +649,6 @@ static void deactivate_rtp(private_object_t *tech_pvt) loops++; } switch_rtp_destroy(&tech_pvt->rtp_session); - tech_pvt->rtp_session = NULL; } } diff --git a/src/switch_rtp.c b/src/switch_rtp.c index a45ff985df..3927290037 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -547,6 +547,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_ice(switch_rtp_t *rtp_sessio SWITCH_DECLARE(void) switch_rtp_kill_socket(switch_rtp_t *rtp_session) { + assert(rtp_session != NULL); switch_mutex_lock(rtp_session->flag_mutex); apr_socket_shutdown(rtp_session->sock, APR_SHUTDOWN_READWRITE); switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_IO);