Changeset 5586 for pjproject

Timestamp:

Apr 25, 2017 9:45:10 AM (7 years ago)

Author:

riza

Message:

Fix #2013: Prevent crash when timer refresh with SRTP is interrupted by a re-INVITE.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_srtp.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -1254 +1254 @@
         return PJMEDIA_SDP_EINATTR;
     }
-    crypto->name = token;
+    pj_strdup(pool, &crypto->name, &token);    
 
     /* Key method */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -3022 +3022 @@
                 call_med->dir = PJMEDIA_DIR_NONE;
 
-            } else {
+            } else if (call_med->tp) {
                 pjmedia_transport_info tp_info;
                 pjmedia_srtp_info *srtp_info;
@@ -3180 +3180 @@
                 call_med->dir = PJMEDIA_DIR_NONE;
 
-            } else {
+            } else if (call_med->tp) {
                 pjmedia_transport_info tp_info;
                 pjmedia_srtp_info *srtp_info;