diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2013-05-30 08:32:07 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2013-05-30 08:32:07 +0000 |
| commit | ebfa1a5e90eda4bc52dfa540ec833a77261ab37b (patch) | |
| tree | d9162c74db284559c92c4d0f7e73f59979fc8579 /pjsip | |
| parent | 3af8a100def74c906c2979ae3aad083dd74aaa1b (diff) | |
Re #1630 (misc): Fixed various error handling (sip_transport.c and sip_endpoint.c)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4529 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip')
| -rw-r--r-- | pjsip/src/pjsip/sip_endpoint.c | 1 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_transport.c | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c index 8c809895..63f296f9 100644 --- a/pjsip/src/pjsip/sip_endpoint.c +++ b/pjsip/src/pjsip/sip_endpoint.c @@ -558,6 +558,7 @@ on_error: pj_mutex_destroy(endpt->mutex); endpt->mutex = NULL; } + deinit_sip_parser(); if (endpt->mod_mutex) { pj_rwmutex_destroy(endpt->mod_mutex); endpt->mod_mutex = NULL; diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c index 1edda409..ef2de49e 100644 --- a/pjsip/src/pjsip/sip_transport.c +++ b/pjsip/src/pjsip/sip_transport.c @@ -1218,14 +1218,14 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_create( pj_pool_t *pool, #if defined(PJ_DEBUG) && PJ_DEBUG!=0 status = pj_atomic_create(pool, 0, &mgr->tdata_counter); - if (status != PJ_SUCCESS) - return status; + if (status != PJ_SUCCESS) { + pj_lock_destroy(mgr->lock); + return status; + } #endif /* Set transport state callback */ - status = pjsip_tpmgr_set_state_cb(mgr, &tp_state_callback); - if (status != PJ_SUCCESS) - return status; + pjsip_tpmgr_set_state_cb(mgr, &tp_state_callback); PJ_LOG(5, (THIS_FILE, "Transport manager created.")); |