Changeset 5794 for pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

Timestamp:

May 18, 2018 7:12:41 AM (6 years ago)

Author:

nanang

Message:

Re #2096:

• Fixed memory leak due to not destroyed DTLS-SRTP keying (when it is not active).
• DTLS-SRTP must not destroy itself, keying destroy must be initiated by SRTP.

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_srtp_dtls.c

@@ -1062 +1062 @@
         switch (ds->srtp->setting.use) {
             case PJMEDIA_SRTP_DISABLED:
-                if (attr_setup)
-                    return PJMEDIA_SRTP_ESDPINTRANSPORT;
+                if (attr_setup) {
+                    status = PJMEDIA_SRTP_ESDPINTRANSPORT;
+                    goto on_return;
+                }
                 break;
             case PJMEDIA_SRTP_OPTIONAL:
                 break;
             case PJMEDIA_SRTP_MANDATORY:
-                if (!attr_setup)
-                    return PJMEDIA_SRTP_ESDPINTRANSPORT;
+                if (!attr_setup) {
+                    status = PJMEDIA_SRTP_ESDPINTRANSPORT;
+                    goto on_return;
+                }
                 break;
         }
@@ -1078 +1082 @@
 
 on_return:
+#if DTLS_DEBUG
     if (status != PJ_SUCCESS) {
         pj_perror(4, ds->base.name, status, "dtls_media_create() failed");
-        dtls_destroy(tp);
-    }
+    }
+#endif
     return status;
 }
@@ -1256 +1261 @@
 
 on_return:
+#if DTLS_DEBUG
     if (status != PJ_SUCCESS) {
         pj_perror(4, ds->base.name, status, "dtls_encode_sdp() failed");
-        dtls_destroy(tp);
-    }
+    }
+#endif
     return status;
 }
@@ -1393 +1399 @@
 
 on_return:
+#if DTLS_DEBUG
     if (status != PJ_SUCCESS) {
         pj_perror(4, ds->base.name, status, "dtls_media_start() failed");
-        dtls_destroy(tp);
-    }
+    }
+#endif
     return status;
 }