]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Prevent crash when an SDP offer is received with an encrypted video stream when suppo...
authorJoshua Colp <jcolp@digium.com>
Thu, 19 Jan 2012 21:12:20 +0000 (21:12 +0000)
committerJoshua Colp <jcolp@digium.com>
Thu, 19 Jan 2012 21:12:20 +0000 (21:12 +0000)
(closes issue ASTERISK-19202)
Reported by: Catalin Sanda
........

Merged revisions 351504 from http://svn.asterisk.org/svn/asterisk/branches/1.8

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@351505 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 7608738c6190b04ed02ae8b4a07e20faf6256f88..90c11076b934f18bffc1cadcefe34c3631906335 100644 (file)
@@ -30139,6 +30139,12 @@ static int setup_srtp(struct sip_srtp **srtp)
 
 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;
        }