Merged revisions 139015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines sip_read should properly handle a NULL return from sip_rtp_read. (closes issue #13257) Reported by: travishein ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
78c68e8015
commit
c4b34ef45d
1 changed files with 1 additions and 1 deletions
|
@ -5912,7 +5912,7 @@ static struct ast_frame *sip_read(struct ast_channel *ast)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Only allow audio through if they sent progress with SDP, or if the channel is actually answered */
|
/* Only allow audio through if they sent progress with SDP, or if the channel is actually answered */
|
||||||
if (fr->frametype == AST_FRAME_VOICE && p->invitestate != INV_EARLY_MEDIA && ast->_state != AST_STATE_UP) {
|
if (fr && fr->frametype == AST_FRAME_VOICE && p->invitestate != INV_EARLY_MEDIA && ast->_state != AST_STATE_UP) {
|
||||||
fr = &ast_null_frame;
|
fr = &ast_null_frame;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue