Changeset 4314

Timestamp:

Jan 11, 2013 4:10:08 AM (12 years ago)

Author:

nanang

Message:

Fix #1604: crash caused by double destructions in ICE stream transport.

File:

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

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -742 +742 @@
     PJ_ASSERT_RETURN(ice_st, PJ_EINVAL);
 
+    sess_add_ref(ice_st);
     ice_st->destroy_req = PJ_TRUE;
-    if (pj_atomic_get(ice_st->busy_cnt) > 0) {
+    if (sess_dec_ref(ice_st)) {
         PJ_LOG(5,(ice_st->obj_name, 
                   "ICE strans object is busy, will destroy later"));
         return PJ_EPENDING;
     }
-    
-    destroy_ice_st(ice_st);
+
     return PJ_SUCCESS;
 }
@@ -771 +771 @@
     pj_assert(count >= 0);
     if (count==0 && ice_st->destroy_req) {
-        pj_ice_strans_destroy(ice_st);
+        destroy_ice_st(ice_st);
         return PJ_FALSE;
     } else {