Changeset 4203 for pjproject/trunk

Timestamp:

Jul 12, 2012 6:39:36 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1552: Possible crash if media transport stop() is called on ICE transport while ICE is not created (thanks Iliya Prince for the fix)

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/transport_ice.c (modified) (1 diff)
• pjnath/src/pjnath/ice_strans.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/transport_ice.c

@@ -286 +286 @@
     }
 
-    pj_ice_strans_stop_ice(tp_ice->ice_st);
+    if (tp_ice->ice_st) {
+        pj_ice_strans_stop_ice(tp_ice->ice_st);
+    }
 
     tp_ice->use_ice = PJ_FALSE;

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

@@ -1146 +1146 @@
 PJ_DEF(pj_status_t) pj_ice_strans_stop_ice(pj_ice_strans *ice_st)
 {
+    PJ_ASSERT_RETURN(ice_st, PJ_EINVAL);
+
     if (ice_st->ice) {
         pj_ice_sess_destroy(ice_st->ice);