sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5655 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Riza Sulistyo 2017-09-20 05:04:25 +00:00
parent e307352851
commit 88ada0cae7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pjnath/src/pjnath-test/ice_test.c
View File

@ -430,6 +430,9 @@ static void ice_on_ice_complete(pj_ice_strans *ice_st,
struct ice_ept *ept;
ept = (struct ice_ept*) pj_ice_strans_get_user_data(ice_st);
if (!ept)
return;
switch (op) {
case PJ_ICE_STRANS_OP_INIT:
ept->result.init_status = status;

6
pjnath/src/pjnath/ice_strans.c
View File

@ -1559,6 +1559,7 @@ static void on_ice_complete(pj_ice_sess *ice, pj_status_t status)
pj_ice_strans *ice_st = (pj_ice_strans*)ice->user_data;
pj_time_val t;
unsigned msec;
pj_ice_strans_cb cb = ice_st->cb;
pj_grp_lock_add_ref(ice_st->grp_lock);
@ -1566,7 +1567,7 @@ static void on_ice_complete(pj_ice_sess *ice, pj_status_t status)
PJ_TIME_VAL_SUB(t, ice_st->start_time);
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];
pj_strerror(status, errmsg, sizeof(errmsg));
@ -1639,8 +1640,7 @@ static void on_ice_complete(pj_ice_sess *ice, pj_status_t status)
PJ_ICE_STRANS_STATE_FAILED;
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();
}