From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 22 Feb 2007 00:57:36 +0000 (+0000)
Subject: Merged revisions 56010 via svnmerge from
X-Git-Tag: 1.4.1~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=71921a8329060746622277596010d9ab9e4a4c88;p=thirdparty%2Fasterisk.git

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

........
r56010 | russell | 2007-02-21 18:53:25 -0600 (Wed, 21 Feb 2007) | 3 lines

If we receive a frame that is not in any of the negotiated formats, then drop
it.  (potentially issue #8781 and SPD-12)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e274976084..77861078d1 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4078,6 +4078,13 @@ 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 & 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",
+							ast_getformatname(f->subclass), p->owner->name);
+					}
+					return &ast_null_frame;
+				}
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Oooh, format changed to %d\n", f->subclass);
 				p->owner->nativeformats = (p->owner->nativeformats & AST_FORMAT_VIDEO_MASK) | f->subclass;