[asterisk-commits] mjordan: tag 1.8.8.2 r351518 - in /tags/1.8.8.2: ./ channels/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Jan 19 15:21:15 2012
New Revision: 351518

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=351518
Log:
Merge 351504

Modified:
    tags/1.8.8.2/   (props changed)
    tags/1.8.8.2/.version
    tags/1.8.8.2/ChangeLog
    tags/1.8.8.2/channels/chan_sip.c

Propchange: tags/1.8.8.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 15:21:15 2012
@@ -1,1 +1,1 @@
-/branches/1.8:339719,339779,340878,341088,343621,345063,345828-345829,347058,347531,349339
+/branches/1.8:339719,339779,340878,341088,343621,345063,345828-345829,347058,347531,349339,351504

Modified: tags/1.8.8.2/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.2/.version?view=diff&rev=351518&r1=351517&r2=351518
==============================================================================
--- tags/1.8.8.2/.version (original)
+++ tags/1.8.8.2/.version Thu Jan 19 15:21:15 2012
@@ -1,1 +1,1 @@
-1.8.8.1
+1.8.8.2

Modified: tags/1.8.8.2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.2/ChangeLog?view=diff&rev=351518&r1=351517&r2=351518
==============================================================================
--- tags/1.8.8.2/ChangeLog (original)
+++ tags/1.8.8.2/ChangeLog Thu Jan 19 15:21:15 2012
@@ -1,3 +1,9 @@
+2012-01-19  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 1.8.8.2 Released.
+
+	* AST-2012-001
+
 2011-12-30  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 1.8.8.1 Released.

Modified: tags/1.8.8.2/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.8.8.2/channels/chan_sip.c?view=diff&rev=351518&r1=351517&r2=351518
==============================================================================
--- tags/1.8.8.2/channels/chan_sip.c (original)
+++ tags/1.8.8.2/channels/chan_sip.c Thu Jan 19 15:21:15 2012
@@ -28977,6 +28977,12 @@
 
 static int process_crypto(struct sip_pvt *p, struct ast_rtp_instance *rtp, struct sip_srtp **srtp, const char *a)
 {
+	/* If no RTP instance exists for this media stream don't bother processing the crypto line */
+	if (!rtp) {
+		ast_debug(3, "Received offer with crypto line for media stream that is not enabled\n");
+		return FALSE;
+	}
+
 	if (strncasecmp(a, "crypto:", 7)) {
 		return FALSE;
 	}