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 /pjsip | |
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 'pjsip')
-rw-r--r-- | pjsip/src/pjsip/sip_transport.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |