Changeset 2258 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Sep 2, 2008 7:40:34 AM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #607: Assertion and possibly crash in ICE stream transport when client is not behind NAT (thanks Nicolas Fauvel for the report)

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (1 diff)

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

@@ -1288 +1288 @@
                 if (dup) {
                     /* Duplicate found, remove the srflx candidate */
+                    unsigned idx = cand - comp->cand_list;
+
+                    /* Update default candidate index */
+                    if (comp->default_cand > idx) {
+                        --comp->default_cand;
+                    } else if (comp->default_cand == idx) {
+                        comp->default_cand = 0;
+                    }
+
+                    /* Remove srflx candidate */
                     pj_array_erase(comp->cand_list, sizeof(comp->cand_list[0]),
-                                   comp->cand_cnt, cand - comp->cand_list);
+                                   comp->cand_cnt, idx);
                     --comp->cand_cnt;
                 } else {