Changeset 5872 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Sep 3, 2018 7:13:40 AM (6 years ago)

Author:

ming

Message:

Re #2100: Fixed duplication of crypto names and keys to use pj_strdup(). Otherwise, when the account/global config's input strings are modified (or deallocated) after being passed to PJSIP, then the crypto name matching will fail and we will generate error: PJMEDIA_SRTP_ENOTSUPCRYPTO

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (2 diffs)

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

@@ -144 +144 @@
         pj_strdup_with_null(pool, &dst->stun_srv[i], &src->stun_srv[i]);
     }
+
+    pjsua_srtp_opt_dup(pool, &dst->srtp_opt, &src->srtp_opt, PJ_FALSE);
 }
 
@@ -261 +263 @@
 {
     pj_bzero(cfg, sizeof(*cfg));
+}
+
+
+PJ_DEF(void) pjsua_srtp_opt_dup( pj_pool_t *pool, pjsua_srtp_opt *dst,
+                                 const pjsua_srtp_opt *src,
+                                 pj_bool_t check_str)
+{
+    pj_memcpy(dst, src, sizeof(*src));
+    if (pool) {
+        unsigned i;
+        
+        for (i = 0; i < src->crypto_count; i++) {
+            if (!check_str ||
+                pj_stricmp(&dst->crypto[i].key, &src->crypto[i].key))
+            {
+                pj_strdup(pool, &dst->crypto[i].key, &src->crypto[i].key);
+            }
+            if (!check_str ||
+                pj_stricmp(&dst->crypto[i].name, &src->crypto[i].name))
+            {
+                pj_strdup(pool, &dst->crypto[i].name, &src->crypto[i].name);
+            }
+        }
+    }
 }