From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 22 Feb 2007 00:53:25 +0000 (+0000)
Subject: If we receive a frame that is not in any of the negotiated formats, then drop
X-Git-Tag: 1.2.16~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9d26b5a89f2559cf1a38336ca7acb0767112318;p=thirdparty%2Fasterisk.git

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.2@56010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 577ac71e8f..594f5e6a9b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3043,6 +3043,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);