Changeset 5655

Timestamp:

Sep 20, 2017 5:04:25 AM (7 years ago)

Author:

riza

Message:

Close #2043: Fixed pjnath-test crash due to access to an invalid callback.

Location:

pjproject/trunk/pjnath/src

Files:

• pjnath-test/ice_test.c (modified) (1 diff)
• pjnath/ice_strans.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath-test/ice_test.c

@@ -431 +431 @@
 
     ept = (struct ice_ept*) pj_ice_strans_get_user_data(ice_st);
+    if (!ept)
+        return;
+
     switch (op) {
     case PJ_ICE_STRANS_OP_INIT:

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

@@ -1560 +1560 @@
     pj_time_val t;
     unsigned msec;
+    pj_ice_strans_cb cb = ice_st->cb;
 
     pj_grp_lock_add_ref(ice_st->grp_lock);
@@ -1567 +1568 @@
     msec = PJ_TIME_VAL_MSEC(t);
 
-    if (ice_st->cb.on_ice_complete) {
+    if (cb.on_ice_complete) {
         if (status != PJ_SUCCESS) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -1640 +1641 @@
 
         pj_log_push_indent();
-        (*ice_st->cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_NEGOTIATION,
-                                      status);
+        (*cb.on_ice_complete)(ice_st, PJ_ICE_STRANS_OP_NEGOTIATION, status);
         pj_log_pop_indent();