Changeset 4205 for pjproject/trunk

Timestamp:

Jul 14, 2012 12:49:36 PM (12 years ago)

Author:

bennylp

Message:

Fixed #1554: Assertion in ICE when STUN resolution yields a same address as one of the host candidate and there is only one host candidate exists (thanks Claudio De Angelis for the report)

File:

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

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

@@ -504 +504 @@
     }
 
+    /* It's possible that we end up without any candidates */
+    if (comp->cand_cnt == 0) {
+        PJ_LOG(4,(ice_st->obj_name,
+                  "Error: no candidate is created due to settings"));
+        return PJ_EINVAL;
+    }
+
     return PJ_SUCCESS;
 }
@@ -1549 +1556 @@
                         --comp->default_cand;
                     } else if (comp->default_cand == idx) {
-                        comp->default_cand = !idx;
+                        comp->default_cand = 0;
                     }
 
@@ -1577 +1584 @@
             if (cand)
                 cand->status = status;
-            if (!ice_st->cfg.stun.ignore_stun_error) {
+            if (!ice_st->cfg.stun.ignore_stun_error || comp->cand_cnt==1) {
                 sess_fail(ice_st, PJ_ICE_STRANS_OP_INIT,
                           "STUN binding request failed", status);