Changeset 2202 for pjproject

Timestamp:

Aug 11, 2008 3:17:40 PM (16 years ago)

Author:

bennylp

Message:

Ticket #591: Assertion failure in ICE session (thanks Pedro Gonçalves for the report)

File:

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

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

@@ -1637 +1637 @@
     PJ_ASSERT_RETURN(ice->clist.count > 0, PJ_EINVALIDOP);
 
+    /* Lock session */
+    pj_mutex_lock(ice->mutex);
+
     LOG4((ice->obj_name, "Starting ICE check.."));
 
@@ -1660 +1663 @@
     if (i == clist->count) {
         pj_assert(!"Unable to find checklist for component 1");
+        pj_mutex_unlock(ice->mutex);
         return PJNATH_EICEINCOMPID;
     }
@@ -1711 +1715 @@
     }
 
+    pj_mutex_unlock(ice->mutex);
     return status;
 }
@@ -2192 +2197 @@
      */
     if (i == ice->rcand_cnt) {
+        if (ice->rcand_cnt >= PJ_ICE_MAX_CAND) {
+            LOG4((ice->obj_name, 
+                  "Unable to add new peer reflexive candidate: too many "
+                  "candidates already (%d)", PJ_ICE_MAX_CAND));
+            return;
+        }
+
         rcand = &ice->rcand[ice->rcand_cnt++];
         rcand->comp_id = (pj_uint8_t)rcheck->comp_id;