[svn-commits] russell: trunk r56012 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: russell
Date: Wed Feb 21 18:59:17 2007
New Revision: 56012

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56012
Log:
Merged revisions 56011 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r56011 | russell | 2007-02-21 18:57:36 -0600 (Wed, 21 Feb 2007) | 11 lines

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)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=56012&r1=56011&r2=56012
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Feb 21 18:59:17 2007
@@ -4424,6 +4424,13 @@
 		/* 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 | AST_FORMAT_TEXT_MASK)) | f->subclass;