diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-03-08 08:52:40 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-03-08 08:52:40 +0000 |
| commit | 9061d2f08c2e69ebf4028a5bb1c44dc119051b05 (patch) | |
| tree | 3970c0dfe74eff18f88d2f819ed38419ea697e31 /pjsip/src/pjsua-lib | |
| parent | b24558f7cbc9fabf6f2c5824c9ae9ef8b0b73f3e (diff) | |
Fixed #1637: Crash in pjsua_media_channel_update() if one media gets rejected
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4433 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib')
| -rw-r--r-- | pjsip/src/pjsua-lib/pjsua_media.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c index e2cbd4cb..76306102 100644 --- a/pjsip/src/pjsua-lib/pjsua_media.c +++ b/pjsip/src/pjsua-lib/pjsua_media.c @@ -2576,8 +2576,11 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, continue; } + /* Codec parameter of stream info (si->param) can be NULL if + * the stream is rejected or disabled. + */ /* Override ptime, if this option is specified. */ - if (pjsua_var.media_cfg.ptime != 0) { + if (pjsua_var.media_cfg.ptime != 0 && si->param) { si->param->setting.frm_per_pkt = (pj_uint8_t) (pjsua_var.media_cfg.ptime / si->param->info.frm_ptime); if (si->param->setting.frm_per_pkt == 0) @@ -2585,7 +2588,7 @@ pj_status_t pjsua_media_channel_update(pjsua_call_id call_id, } /* Disable VAD, if this option is specified. */ - if (pjsua_var.media_cfg.no_vad) { + if (pjsua_var.media_cfg.no_vad && si->param) { si->param->setting.vad = 0; } |