Changeset 1398 for pjproject/trunk

Timestamp:

Jun 28, 2007 2:47:32 AM (17 years ago)

Author:

bennylp

Message:

Ticket #349: Crash when sending PUBLISH when network is unreachable

Location:

pjproject/trunk/pjsip/src

Files:

• pjsip-simple/publishc.c (modified) (2 diffs)
• pjsua-lib/pjsua_pres.c (modified) (2 diffs)

pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

@@ -597 +597 @@
                                       &tsx_callback);
     if (status!=PJ_SUCCESS) {
-        --pubc->pending_tsx;
+        // no need to decrement, callback has been called and it should
+        // already decremented pending_tsx. Decrementing this here may 
+        // cause accessing freed memory location.
+        //--pubc->pending_tsx;
         PJ_LOG(4,(THIS_FILE, "Error sending request, status=%d", status));
     }
@@ -604 +607 @@
 }
 
-

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

@@ -700 +700 @@
 
 on_error:
-    pjsip_publishc_destroy(acc->publish_sess);
-    acc->publish_sess = NULL;
+    if (acc->publish_sess) {
+        pjsip_publishc_destroy(acc->publish_sess);
+        acc->publish_sess = NULL;
+    }
     return status;
 }
@@ -736 +738 @@
 
         /* Add credential for authentication */
-        pjsip_publishc_set_credentials(acc->publish_sess, acc->cred_cnt, 
-                                       acc->cred);
+        if (acc->cred_cnt) {
+            pjsip_publishc_set_credentials(acc->publish_sess, acc->cred_cnt, 
+                                           acc->cred);
+        }
 
         /* Set route-set */