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 577ac71e8ff9384755db4b233b02461ce59a8aed..594f5e6a9b0bb92d7022d8d39f279cfc7f8befc2 100644 (file)
--- 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);