Changeset 4196 for pjproject/trunk/pjnath/src/pjnath/ice_session.c

Timestamp:

Jul 5, 2012 7:02:50 AM (12 years ago)

Author:

bennylp

Message:

Re #1548: Crash due to racing condition in timer when call is disconnected quickly (thanks Joshua Colp for the report!)

File:

• pjproject/trunk/pjnath/src/pjnath/ice_session.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_session.c

@@ -456 +456 @@
     }
 
+    ice->is_destroying = PJ_TRUE;
+
     /* Let other callbacks finish */
     if (ice->mutex) {
@@ -1841 +1843 @@
     clist = td->clist;
 
+    if (ice->is_destroying)
+        return PJ_SUCCESS;
+
     pj_mutex_lock(ice->mutex);
+
+    if (ice->is_destroying) {
+        pj_mutex_unlock(ice->mutex);
+        return PJ_SUCCESS;
+    }
 
     /* Set timer ID to FALSE first */