kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #557 in FS/freeswitch from ~BRADLEYJOKINEN/freeswitch:FS-8348 to master 

* commit 'a52aaa922542996f083071f8005125523c66cd30':
  FS-8348 Fix crash caused by trying to get channel of a null session
This commit is contained in:
Mike Jerris 2015-10-15 12:26:15 -05:00
parent df8d8713fe a52aaa9225
commit 79933d30b2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/codecs/mod_opus/mod_opus.c
View File

@ -753,7 +753,6 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
if (*flag & SFF_PLC) { if (*flag & SFF_PLC) {
switch_core_session_t *session = codec->session; switch_core_session_t *session = codec->session;
switch_channel_t *channel = switch_core_session_get_channel(session);
switch_jb_t *jb = NULL; switch_jb_t *jb = NULL;
plc = 1; plc = 1;
@ -761,6 +760,8 @@ static switch_status_t switch_opus_decode(switch_codec_t *codec,
encoded_data = NULL; encoded_data = NULL;
if ((opus_prefs.use_jb_lookahead || context->use_jb_lookahead) && context->codec_settings.useinbandfec && session) { if ((opus_prefs.use_jb_lookahead || context->use_jb_lookahead) && context->codec_settings.useinbandfec && session) {
switch_channel_t *channel = switch_core_session_get_channel(session);
if (!context->look_check) { if (!context->look_check) {
context->look_ts = switch_true(switch_channel_get_variable_dup(channel, "jb_use_timestamps", SWITCH_FALSE, -1)); context->look_ts = switch_true(switch_channel_get_variable_dup(channel, "jb_use_timestamps", SWITCH_FALSE, -1));
context->look_check = 1; context->look_check = 1;