kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-01 19:20:05 +00:00
Code Issues Projects Releases Wiki Activity

fix bug 2 (core was hacking the buffer size value)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@576 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-02-09 17:01:32 +00:00
parent 95fbe70503
commit ef6d92ae7d
2 changed files with 165 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/codecs/mod_gsm/mod_gsm.c
View File

@ -105,12 +105,14 @@
if (!context) { if (!context) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (encoded_data_len % 33 == 0) { if (encoded_data_len % 33 == 0) {
int loops = (int) encoded_data_len / 33; int loops = (int) encoded_data_len / 33;
gsm_byte * edp = encoded_data; gsm_byte * edp = encoded_data;
gsm_signal * ddp = decoded_data; gsm_signal * ddp = decoded_data;
int x; int x;
unsigned int new_len = 0; unsigned int new_len = 0;
for (x = 0; x < loops && new_len < *decoded_data_len; x++) { for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
gsm_decode(context->decoder, edp, ddp); gsm_decode(context->decoder, edp, ddp);
ddp += 160; ddp += 160;
@ -120,7 +122,7 @@
if (new_len <= *decoded_data_len) { if (new_len <= *decoded_data_len) {
*decoded_data_len = new_len; *decoded_data_len = new_len;
} else { } else {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!! %d %d\n", new_len, *decoded_data_len);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
} else { } else {

7
src/switch_core.c
View File

@ -330,7 +330,7 @@ SWITCH_DECLARE(switch_status) switch_core_codec_encode(switch_codec *codec,
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
*encoded_data_len = decoded_data_len;
return codec->implementation->encode(codec, return codec->implementation->encode(codec,
other_codec, other_codec,
decoded_data, decoded_data,
@ -352,6 +352,8 @@ SWITCH_DECLARE(switch_status) switch_core_codec_decode(switch_codec *codec,
assert(encoded_data != NULL); assert(encoded_data != NULL);
assert(decoded_data != NULL); assert(decoded_data != NULL);
if (!codec->implementation) { if (!codec->implementation) {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Codec is not initilized!\n"); switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Codec is not initilized!\n");
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
@ -362,7 +364,7 @@ SWITCH_DECLARE(switch_status) switch_core_codec_decode(switch_codec *codec,
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
*decoded_data_len = encoded_data_len;
return codec->implementation->decode(codec, return codec->implementation->decode(codec,
other_codec, other_codec,
encoded_data, encoded_data,
@ -1090,6 +1092,7 @@ SWITCH_DECLARE(switch_status) switch_core_session_write_frame(switch_core_sessio
if (need_codec) { if (need_codec) {
if (frame->codec) { if (frame->codec) {
session->raw_write_frame.datalen = session->raw_write_frame.buflen; session->raw_write_frame.datalen = session->raw_write_frame.buflen;
status = switch_core_codec_decode(frame->codec, status = switch_core_codec_decode(frame->codec,
session->write_codec, session->write_codec,
frame->data, frame->data,