Changeset 5811 for pjproject

Timestamp:

Jun 22, 2018 5:13:02 PM (6 years ago)

Author:

riza

Message:

Re #2059 (misc): Fixed some error on transport_srtp.c after #2097 + #2096.

• Fixed nullptr exception, because opt pointer might not be set.
• Remove assertion to check pool and sdp in pjmedia_transport_media_start().

Thanks to Ciro Ferraiuolo for the report.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp.c

@@ -737 +737 @@
      * i.e: all available crypto but 'NULL'.
      */
-    if (srtp->setting.crypto_count == 0 && opt->use != PJMEDIA_SRTP_DISABLED)
+    if (srtp->setting.crypto_count == 0 && 
+        srtp->setting.use != PJMEDIA_SRTP_DISABLED)
     {
         srtp->setting.crypto_count = PJMEDIA_SRTP_MAX_CRYPTOS;
@@ -1644 +1645 @@
     unsigned i;
 
-    PJ_ASSERT_RETURN(tp && pool && sdp_local && sdp_remote, PJ_EINVAL);
+    PJ_ASSERT_RETURN(tp, PJ_EINVAL);
 
     status = pjmedia_transport_media_start(srtp->member_tp, pool,