Merge branch 'dev_bt_session_version'

[linphone] / coreapi / linphonecall.c

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 285678f3ab4b8adb5ed7e206fbb9d48078b0c257..6ef8e0c553a4a188f4096827238b9d4279ca5f30 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -1667,18 +1667,20 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
        new_stream = sal_media_description_find_stream(new_md, SalProtoRtpSavp, SalAudio);
        if (old_stream && new_stream) {
                const SalStreamDescription *local_st_desc = sal_media_description_find_stream(call->localdesc, SalProtoRtpSavp, SalAudio);
-               int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag);
-               if (crypto_idx >= 0) {
-                       audio_stream_enable_srtp(call->audiostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key);
-                       call->audiostream_encrypted = TRUE;
-               } else {
-                       ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag);
-                       call->audiostream_encrypted = FALSE;
-               }
-               for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) {
-                       old_stream->crypto[i].tag = new_stream->crypto[i].tag;
-                       old_stream->crypto[i].algo = new_stream->crypto[i].algo;
-                       strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1);
+               if (local_st_desc) {
+                       int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag);
+                       if (crypto_idx >= 0) {
+                               audio_stream_enable_srtp(call->audiostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key);
+                               call->audiostream_encrypted = TRUE;
+                       } else {
+                               ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag);
+                               call->audiostream_encrypted = FALSE;
+                       }
+                       for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) {
+                               old_stream->crypto[i].tag = new_stream->crypto[i].tag;
+                               old_stream->crypto[i].algo = new_stream->crypto[i].algo;
+                               strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1);
+                       }
                }
        }
 
@@ -1687,18 +1689,20 @@ void linphone_call_update_crypto_parameters(LinphoneCall *call, SalMediaDescript
        new_stream = sal_media_description_find_stream(new_md, SalProtoRtpSavp, SalVideo);
        if (old_stream && new_stream) {
                const SalStreamDescription *local_st_desc = sal_media_description_find_stream(call->localdesc, SalProtoRtpSavp, SalVideo);
-               int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag);
-               if (crypto_idx >= 0) {
-                       video_stream_enable_strp(call->videostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key);
-                       call->videostream_encrypted = TRUE;
-               } else {
-                       ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag);
-                       call->videostream_encrypted = FALSE;
-               }
-               for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) {
-                       old_stream->crypto[i].tag = new_stream->crypto[i].tag;
-                       old_stream->crypto[i].algo = new_stream->crypto[i].algo;
-                       strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1);
+               if (local_st_desc) {
+                       int crypto_idx = find_crypto_index_from_tag(local_st_desc->crypto, new_stream->crypto_local_tag);
+                       if (crypto_idx >= 0) {
+                               video_stream_enable_strp(call->videostream, new_stream->crypto[0].algo, local_st_desc->crypto[crypto_idx].master_key, new_stream->crypto[0].master_key);
+                               call->videostream_encrypted = TRUE;
+                       } else {
+                               ms_warning("Failed to find local crypto algo with tag: %d", new_stream->crypto_local_tag);
+                               call->videostream_encrypted = FALSE;
+                       }
+                       for (i = 0; i < SAL_CRYPTO_ALGO_MAX; i++) {
+                               old_stream->crypto[i].tag = new_stream->crypto[i].tag;
+                               old_stream->crypto[i].algo = new_stream->crypto[i].algo;
+                               strncpy(old_stream->crypto[i].master_key, new_stream->crypto[i].master_key, sizeof(old_stream->crypto[i].master_key) - 1);
+                       }
                }
        }
 #endif