Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

add a check to prevent a seg fault from an unknown cause ... (bug #3496)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Russell Bryant 21 years ago
parent ee53dc7286
commit fd7f18421d
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File

25
channels/chan_skinny.c
Unescape View File

@ -1576,19 +1576,22 @@ static int skinny_answer(struct ast_channel *ast)
static struct ast_frame *skinny_rtp_read(struct skinny_subchannel *sub) static struct ast_frame *skinny_rtp_read(struct skinny_subchannel *sub)
{ {
/* Retrieve audio/etc from channel. Assumes sub->lock is already held. */ /* Retrieve audio/etc from channel. Assumes sub->lock is already held. */
struct ast_frame *f; struct ast_frame *f = NULL;
f = ast_rtp_read(sub->rtp); if (sub->rtp) {
if (sub->owner) { f = ast_rtp_read(sub->rtp);
/* We already hold the channel lock */ if (sub->owner) {
if (f->frametype == AST_FRAME_VOICE) { /* We already hold the channel lock */
if (f->subclass != sub->owner->nativeformats) { if (f->frametype == AST_FRAME_VOICE) {
ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass); if (f->subclass != sub->owner->nativeformats) {
sub->owner->nativeformats = f->subclass; ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
ast_set_read_format(sub->owner, sub->owner->readformat); sub->owner->nativeformats = f->subclass;
ast_set_write_format(sub->owner, sub->owner->writeformat); ast_set_read_format(sub->owner, sub->owner->readformat);
ast_set_write_format(sub->owner, sub->owner->writeformat);
}
} }
} }
} } else
ast_log(LOG_WARNING, "sub->rtp is NULL - calling read on a channel that has been hungup?\n");
return f; return f;
} }

Write Preview
Loading…
Cancel
Save