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 8ea2c0efc74a56d8ded5a48ddefe97e06e2e8c9f..39b06598d5b5e2ee27618a61e4a986703fa1d191 100644 (file)
--- 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);