diff options
| -rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 8 | ||||
| -rw-r--r-- | pjnath/src/pjnath/stun_sock.c | 2 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transport.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/pjnath/src/pjnath/stun_msg.c b/pjnath/src/pjnath/stun_msg.c index cce914e2..445a26ed 100644 --- a/pjnath/src/pjnath/stun_msg.c +++ b/pjnath/src/pjnath/stun_msg.c @@ -1137,11 +1137,11 @@ PJ_DEF(pj_status_t) pj_stun_string_attr_init( pj_stun_string_attr *attr, int attr_type, const pj_str_t *value) { - INIT_ATTR(attr, attr_type, value->slen); - if (value && value->slen) + INIT_ATTR(attr, attr_type, 0); + if (value && value->slen) { + attr->value.slen = value->slen; pj_strdup(pool, &attr->value, value); - else - attr->value.slen = 0; + } return PJ_SUCCESS; } diff --git a/pjnath/src/pjnath/stun_sock.c b/pjnath/src/pjnath/stun_sock.c index 333dedd9..c51527db 100644 --- a/pjnath/src/pjnath/stun_sock.c +++ b/pjnath/src/pjnath/stun_sock.c @@ -211,7 +211,7 @@ PJ_DEF(pj_status_t) pj_stun_sock_create( pj_stun_config *stun_cfg, if (stun_sock->ka_interval == 0) stun_sock->ka_interval = PJ_STUN_KEEP_ALIVE_SEC; - if (cfg && cfg->grp_lock) { + if (cfg->grp_lock) { stun_sock->grp_lock = cfg->grp_lock; } else { status = pj_grp_lock_create(pool, NULL, &stun_sock->grp_lock); diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index 7caa2e99..4851be5c 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -577,13 +577,15 @@ static char *get_msg_info(pj_pool_t *pool, const char *obj_name, PJ_DEF(char*) pjsip_tx_data_get_info( pjsip_tx_data *tdata ) { + PJ_ASSERT_RETURN(tdata, "NULL"); + /* tdata->info may be assigned by application so if it exists * just return it. */ if (tdata->info) return tdata->info; - if (tdata==NULL || tdata->msg==NULL) + if (tdata->msg==NULL) return "NULL"; pj_lock_acquire(tdata->lock); |