Changeset 3375 for pjproject/trunk/pjsip/src/pjsip-simple/publishc.c

Timestamp:

Nov 29, 2010 2:49:37 PM (13 years ago)

Author:

bennylp

Message:

Fixed #1164: Possible crash in PUBLISH session if network connectivity is lost between two requests (thanks Nikolay Popok for the report)

File:

• pjproject/trunk/pjsip/src/pjsip-simple/publishc.c (modified) (4 diffs)

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

@@ -75 +75 @@
     pj_bool_t                    _delete_flag;
     int                          pending_tsx;
+    pj_bool_t                    in_callback;
     pj_mutex_t                  *mutex;
 
@@ -205 +206 @@
     PJ_ASSERT_RETURN(pubc, PJ_EINVAL);
 
-    if (pubc->pending_tsx) {
+    if (pubc->pending_tsx || pubc->in_callback) {
         pubc->_delete_flag = 1;
         pubc->cb = NULL;
@@ -554 +555 @@
     pj_assert(pubc->pending_tsx > 0);
     --pubc->pending_tsx;
+
+    /* Mark that we're in callback to prevent deletion (#1164) */
+    ++pubc->in_callback;
 
     /* If publication data has been deleted by user then remove publication 
@@ -698 +702 @@
     }
 
+    /* No longer in callback. */
+    --pubc->in_callback;
+
     /* Delete the record if user destroy pubc during the callback. */
     if (pubc->_delete_flag && pubc->pending_tsx==0) {