[asterisk-commits] oej: branch oej/teapot-1.8 r402876 - in /team/oej/teapot-1.8: channels/sip/ p...

[SVN commits to the Asterisk project]

Author: oej
Date: Mon Nov 18 08:19:12 2013
New Revision: 402876

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402876
Log:
Check the pointer before using it, stupid.


Modified:
    team/oej/teapot-1.8/channels/sip/sdp_crypto.c
    team/oej/teapot-1.8/patches/lingon-srtp-key-lifetime-1.8.diff

Modified: team/oej/teapot-1.8/channels/sip/sdp_crypto.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/channels/sip/sdp_crypto.c?view=diff&rev=402876&r1=402875&r2=402876
==============================================================================
--- team/oej/teapot-1.8/channels/sip/sdp_crypto.c (original)
+++ team/oej/teapot-1.8/channels/sip/sdp_crypto.c Mon Nov 18 08:19:12 2013
@@ -295,7 +295,7 @@
 					mki = strsep(&info, "|");
 				}
 				/* At this point we do not support multiple keys, sorry */
-				if (*mki != '1') {
+				if (mki != NULL && *mki != '1') {
 					ast_log(LOG_ERROR, "Crypto mki handling not implemented. MKI = %s \n", mki);
 					continue;
 				}
@@ -303,7 +303,7 @@
 
 			}
 			
-			ast_debug(3, "==> SRTP SDES lifetime %s MKI %s \n", lifetime ? lifetime : "-", mki?mki : "-");
+			ast_debug(3, "==> SRTP SDES lifetime %s MKI %s \n", lifetime ? lifetime : "-", mki ? mki : "-");
 
 			if (lifetime) {
 				if (strlen(lifetime) > 2) {

Modified: team/oej/teapot-1.8/patches/lingon-srtp-key-lifetime-1.8.diff
URL: http://svnview.digium.com/svn/asterisk/team/oej/teapot-1.8/patches/lingon-srtp-key-lifetime-1.8.diff?view=diff&rev=402876&r1=402875&r2=402876
==============================================================================
--- team/oej/teapot-1.8/patches/lingon-srtp-key-lifetime-1.8.diff (original)
+++ team/oej/teapot-1.8/patches/lingon-srtp-key-lifetime-1.8.diff Mon Nov 18 08:19:12 2013
@@ -1,7 +1,7 @@
 Index: channels/sip/sdp_crypto.c
 ===================================================================
---- channels/sip/sdp_crypto.c	(.../branches/1.8)	(revision 399443)
-+++ channels/sip/sdp_crypto.c	(.../team/oej/lingon-srtp-key-lifetime-1.8)	(revision 399443)
+--- channels/sip/sdp_crypto.c	(.../branches/1.8)	(revision 402875)
++++ channels/sip/sdp_crypto.c	(.../team/oej/lingon-srtp-key-lifetime-1.8)	(revision 402875)
 @@ -36,6 +36,7 @@
  #include "asterisk/options.h"
  #include "asterisk/utils.h"
@@ -163,7 +163,7 @@
 Index: README.lingon.txt
 ===================================================================
 --- README.lingon.txt	(.../branches/1.8)	(revision 0)
-+++ README.lingon.txt	(.../team/oej/lingon-srtp-key-lifetime-1.8)	(revision 399443)
++++ README.lingon.txt	(.../team/oej/lingon-srtp-key-lifetime-1.8)	(revision 402875)
 @@ -0,0 +1,57 @@
 +Edvina AB
 +Olle E. Johansson
@@ -225,11 +225,34 @@
 
 Property changes on: README.lingon.txt
 ___________________________________________________________________
+Added: svn:mime-type
+## -0,0 +1 ##
++text/plain
+\ No newline at end of property
+Added: svn:keywords
+## -0,0 +1 ##
++Author Date Id Revision
+\ No newline at end of property
 Added: svn:eol-style
-   + native
-Added: svn:mime-type
-   + text/plain
-Added: svn:keywords
-   + Author Date Id Revision
+## -0,0 +1 ##
++native
+\ No newline at end of property
+Index: .
+===================================================================
+--- .	(.../branches/1.8)	(revision 402875)
++++ .	(.../team/oej/lingon-srtp-key-lifetime-1.8)	(revision 402875)
 
-
+Property changes on: .
+___________________________________________________________________
+Added: svnmerge-integrated
+## -0,0 +1 ##
++/branches/1.8:1-402730
+\ No newline at end of property
+Added: automerge-email
+## -0,0 +1 ##
++oej at edvina.net
+\ No newline at end of property
+Added: automerge
+## -0,0 +1 ##
++*
+\ No newline at end of property