Merge branch 'master' into v1.6

src/switch_core_media.c

@@ -10095,6 +10095,10 @@ SWITCH_DECLARE(void) switch_core_media_set_sdp_codec_string(switch_core_session_
 		return;
 	}
 
+	if (!r_sdp) {
+		switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Setting NULL SDP is invalid\n");
+		return;
+	}
 
 	if ((parser = sdp_parse(NULL, r_sdp, (int) strlen(r_sdp), 0))) {