aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-22 01:23:41 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-22 01:23:41 +0000
commitb9b89d3935816b469a3bc15a9a0e35311af19d7b (patch)
tree5aa0c169e8429ba6ed928fa389c3517080521fb6 /channels
parent81aa5b810324e0406651215d16a0e608945756fb (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@56054 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8ea2c0efc..39b06598d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3081,6 +3081,11 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
/* We already hold the channel lock */
if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass != p->owner->nativeformats) {
+ if (!(f->subclass & p->jointcapability)) {
+ ast_log(LOG_DEBUG, "Bogus frame of format '%s' received from '%s'!\n",
+ ast_getformatname(f->subclass), p->owner->name);
+ return &null_frame;
+ }
ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
p->owner->nativeformats = f->subclass;
ast_set_read_format(p->owner, p->owner->readformat);