sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 66768 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r66768 | file | 2007-05-31 12:14:48 -0400 (Thu, 31 May 2007) | 10 lines

Merged revisions 66764 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r66764 | file | 2007-05-31 12:12:39 -0400 (Thu, 31 May 2007) | 2 lines

It is now possible for this path of execution to have the frame pointer be NULL, therefore we need to check for it before trying to access it. (issue #9836 reported by barthpbx)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp 2007-05-31 16:18:14 +00:00
parent e9251f42df
commit 9f79587d47
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@ -4547,10 +4547,10 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
return &ast_null_frame;
/* We already hold the channel lock */
if (!p->owner || f->frametype != AST_FRAME_VOICE)
if (!p->owner || (f && f->frametype != AST_FRAME_VOICE))
return f;
if (f->subclass != (p->owner->nativeformats & AST_FORMAT_AUDIO_MASK)) {
if (f && f->subclass != (p->owner->nativeformats & AST_FORMAT_AUDIO_MASK)) {
if (!(f->subclass & p->jointcapability)) {
if (option_debug) {
ast_log(LOG_DEBUG, "Bogus frame of format '%s' received from '%s'!\n",
@ -4565,7 +4565,7 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
ast_set_write_format(p->owner, p->owner->writeformat);
}
if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) && p->vad) {
if (f && (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_INBAND) && p->vad) {
f = ast_dsp_process(p->owner, p->vad, f);
if (f && f->frametype == AST_FRAME_DTMF) {
if (ast_test_flag(&p->t38.t38support, SIP_PAGE2_T38SUPPORT_UDPTL) && f->subclass == 'f') {