From b346c11e228f60113fb60eac1d3f9e39d089ff24 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Tue, 8 Oct 2013 11:14:42 +0000 Subject: 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 --- pjsip/src/pjsip/sip_transport.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pjsip') 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); -- cgit v1.2.3