[asterisk-commits] mjordan: tag 10.0.1 r351614 - in /tags/10.0.1: ./ channels/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Jan 19 17:08:51 2012
New Revision: 351614

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=351614
Log:
Commit 351505

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

Propchange: tags/10.0.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 17:08:51 2012
@@ -1,1 +1,1 @@
-/branches/10:344493,344557,345064,345830,346040,346856,347068,347344,347532
+/branches/10:344493,344557,345064,345830,346040,346856,347068,347344,347532,351505

Modified: tags/10.0.1/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.0.1/.version?view=diff&rev=351614&r1=351613&r2=351614
==============================================================================
--- tags/10.0.1/.version (original)
+++ tags/10.0.1/.version Thu Jan 19 17:08:51 2012
@@ -1,1 +1,1 @@
-10.0.0
+10.0.1

Modified: tags/10.0.1/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.0.1/ChangeLog?view=diff&rev=351614&r1=351613&r2=351614
==============================================================================
--- tags/10.0.1/ChangeLog (original)
+++ tags/10.0.1/ChangeLog Thu Jan 19 17:08:51 2012
@@ -1,3 +1,9 @@
+2012-01-19  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.0.1 Released.
+
+	* AST-2012-001
+
 2011-12-15  Asterisk Development Team <asteriskteam at digium.com>
 
 	* Asterisk 10.0.0 Released.

Modified: tags/10.0.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.0.1/channels/chan_sip.c?view=diff&rev=351614&r1=351613&r2=351614
==============================================================================
--- tags/10.0.1/channels/chan_sip.c (original)
+++ tags/10.0.1/channels/chan_sip.c Thu Jan 19 17:08:51 2012
@@ -29868,6 +29868,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;
 	}