From: Automerge Script <automerge@asterisk.org>
Date: Thu, 22 Feb 2007 01:23:41 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.16-netsec~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=870af81ca1924e0b8df0933029af9dce144a5dd3;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@56054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8ea2c0efc7..39b06598d5 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);