From 0d5705d396498a0775f61a3720457dfb11568842 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Wed, 14 Jan 2009 20:46:02 +0000 Subject: [PATCH] add extra sanity check git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11203 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core_io.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/switch_core_io.c b/src/switch_core_io.c index 7083de2240..10badff2d5 100644 --- a/src/switch_core_io.c +++ b/src/switch_core_io.c @@ -572,7 +572,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess switch_assert(session != NULL); switch_assert(frame != NULL); - if (switch_channel_get_state(session->channel) >= CS_HANGUP) { + if (!switch_channel_ready(session->channel)) { return SWITCH_STATUS_FALSE; } @@ -605,14 +605,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess switch_mutex_lock(session->codec_write_mutex); - if (!(session->write_codec && session->write_codec->mutex && frame->codec)) { + if (!(session->write_codec && session->write_codec->mutex && frame->codec) || + !switch_channel_ready(session->channel) || !switch_channel_media_ready(session->channel)) { switch_mutex_unlock(session->codec_write_mutex); return SWITCH_STATUS_FALSE; } switch_mutex_lock(session->write_codec->mutex); switch_mutex_lock(frame->codec->mutex); - + if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { if (session->write_codec->implementation->codec_id == frame->codec->implementation->codec_id) {