FS-7479 #resolve

diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h
index 1d2f6c694b2e8c5964e69258bcfbc4b39cefe20f..b8c28b6fec5bd401c5d5e9a6bc8b5eea062f3c5c 100644 (file)
--- a/src/include/switch_resample.h
+++ b/src/include/switch_resample.h
@@ -175,6 +175,9 @@ SWITCH_DECLARE(uint32_t) switch_merge_sln(int16_t *data, uint32_t samples, int16
 SWITCH_DECLARE(uint32_t) switch_unmerge_sln(int16_t *data, uint32_t samples, int16_t *other_data, uint32_t other_samples);
 SWITCH_DECLARE(void) switch_mux_channels(int16_t *data, switch_size_t samples, uint32_t orig_channels, uint32_t channels);
 
+#define switch_resample_calc_buffer_size(_to, _from, _srclen) (uint32_t)((float)(_to / _from) * (float)_srclen * 2)
+
+                                                
 SWITCH_END_EXTERN_C
 #endif
 /* For Emacs:

diff --git a/src/switch_core_io.c b/src/switch_core_io.c
index 52c2fb994b314c07e78fc279dcb7bf636601c098..a4fd15f53935727882bc7aea3dc0ae1b9ff1713f 100644 (file)
--- a/src/switch_core_io.c
+++ b/src/switch_core_io.c
@@ -1245,6 +1245,17 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
                switch_mutex_lock(session->resample_mutex);
                if (session->write_resampler) {
 
+                       if (switch_resample_calc_buffer_size(session->write_resampler->to_rate, session->write_resampler->from_rate,
+                                                                                                write_frame->datalen / 2 / session->write_resampler->channels) > SWITCH_RECOMMENDED_BUFFER_SIZE) {
+                               
+                               switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s not enough buffer space for required resample operation!\n",
+                                                                 switch_channel_get_name(session->channel));
+                               switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
+                               switch_mutex_unlock(session->resample_mutex);
+                               goto error;
+                       }
+               
+
                        switch_resample_process(session->write_resampler, data, write_frame->datalen / 2 / session->write_resampler->channels);
 
                        memcpy(data, session->write_resampler->to, session->write_resampler->to_len * 2 * session->write_resampler->channels);

diff --git a/src/switch_resample.c b/src/switch_resample.c
index ed584e39af57ba886d0bbf026ea6f788f57961d6..000768b46c0b0b7d5f39fa55712bf332bd3a828a 100644 (file)
--- a/src/switch_resample.c
+++ b/src/switch_resample.c
@@ -84,9 +84,13 @@ SWITCH_DECLARE(switch_status_t) switch_resample_perform_create(switch_audio_resa
        return SWITCH_STATUS_SUCCESS;
 }
 
-
 SWITCH_DECLARE(uint32_t) switch_resample_process(switch_audio_resampler_t *resampler, int16_t *src, uint32_t srclen)
 {
+       if (switch_resample_calc_buffer_size(resampler->to_rate, resampler->from_rate, srclen) > SWITCH_RECOMMENDED_BUFFER_SIZE) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Out of Buffer SPACE!\n");
+               return 0;
+       }
+               
        resampler->to_len = resampler->to_size;
        speex_resampler_process_interleaved_int(resampler->resampler, src, &srclen, resampler->to, &resampler->to_len);
        return resampler->to_len;