diff options
| author | Benny Prijono <bennylp@teluu.com> | 2013-10-08 11:14:42 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2013-10-08 11:14:42 +0000 |
| commit | b346c11e228f60113fb60eac1d3f9e39d089ff24 (patch) | |
| tree | 7e9acac73290a222b27e2dc1eea83ceb7a34ab7e /pjnath | |
| parent | 3f8f13384065348166ad808b4781dc4fb3c64832 (diff) | |
Re #1703 General bug fixes: fixed some wrong null checking order
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4615 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjnath')
| -rw-r--r-- | pjnath/src/pjnath/stun_msg.c | 8 | ||||
| -rw-r--r-- | pjnath/src/pjnath/stun_sock.c | 2 |
2 files changed, 5 insertions, 5 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); |