Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsua-lib/pjsua_pres.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsua-lib/pjsua_pres.c (modified) (5 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsua-lib/pjsua_pres.c

@@ -250 +250 @@
 
     /* contact */
-    info->contact.ptr = info->buf_ + total;
-    pj_strncpy(&info->contact, &buddy->contact, sizeof(info->buf_)-total);
-    total += info->contact.slen;
+    if (total < sizeof(info->buf_)) {
+        info->contact.ptr = info->buf_ + total;
+        pj_strncpy(&info->contact, &buddy->contact, sizeof(info->buf_) - total);
+        total += info->contact.slen;
+    } else {
+        info->contact = pj_str("");
+    }
 
     /* Presence status */
@@ -552 +556 @@
         return status;
 
-    PJ_LOG(4,(THIS_FILE, "Buddy %d: unsubscribing presence..", buddy_id));
     pj_log_push_indent();
 
@@ -852 +855 @@
 
     /* Create UAS dialog: */
-    status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, 
-                                  &contact, &dlg);
+    status = pjsip_dlg_create_uas_and_inc_lock(pjsip_ua_instance(), rdata,
+                                               &contact, &dlg);
     if (status != PJ_SUCCESS) {
         pjsua_perror(THIS_FILE, 
@@ -918 +921 @@
         }
 
+        pjsip_dlg_dec_lock(dlg);
         PJSUA_UNLOCK();
         pj_log_pop_indent();
         return PJ_TRUE;
     }
+
+    /* Subscription has been created, decrement & release dlg lock */
+    pjsip_dlg_dec_lock(dlg);
 
     /* If account is locked to specific transport, then lock dialog
@@ -1032 +1039 @@
 
     /* Done: */
-
     PJSUA_UNLOCK();
     pj_log_pop_indent();