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

Timestamp:

Sep 4, 2018 2:16:02 AM (6 years ago)

Author:

ming

Message:

Re #2100: Fix the optimization part of r5872, which didn't work since we don't preserve the old strings.

File:

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

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

@@ -270 +270 @@
                                  pj_bool_t check_str)
 {
+    pjsua_srtp_opt backup_dst;
+    
+    if (check_str) pj_memcpy(&backup_dst, dst, sizeof(*dst));
     pj_memcpy(dst, src, sizeof(*src));
+
     if (pool) {
         unsigned i;
@@ -279 +283 @@
             {
                 pj_strdup(pool, &dst->crypto[i].key, &src->crypto[i].key);
+            } else {
+                /* If strings are identical, use the old string to
+                 * avoid wasting memory.
+                 */
+                dst->crypto[i].key = backup_dst.crypto[i].key;
             }
             if (!check_str ||
@@ -284 +293 @@
             {
                 pj_strdup(pool, &dst->crypto[i].name, &src->crypto[i].name);
+            } else {
+                /* If strings are identical, use the old string to
+                 * avoid wasting memory.
+                 */
+                dst->crypto[i].name = backup_dst.crypto[i].name;
             }
         }