Add some missing unlocks (#3893)
This commit is contained in:
parent
ca4b078cc1
commit
427a2b3ab8
|
@ -1840,15 +1840,15 @@ PJ_DEF(pj_status_t) pj_dns_resolver_add_entry( pj_dns_resolver *resolver,
|
||||||
pj_bzero(&key, sizeof(struct res_key));
|
pj_bzero(&key, sizeof(struct res_key));
|
||||||
if (pkt->hdr.anscount) {
|
if (pkt->hdr.anscount) {
|
||||||
/* Make sure name is not too long. */
|
/* Make sure name is not too long. */
|
||||||
PJ_ASSERT_RETURN(pkt->ans[0].name.slen < PJ_MAX_HOSTNAME,
|
PJ_ASSERT_ON_FAIL(pkt->ans[0].name.slen < PJ_MAX_HOSTNAME,
|
||||||
PJ_ENAMETOOLONG);
|
{ pj_grp_lock_release(resolver->grp_lock); return PJ_ENAMETOOLONG; });
|
||||||
|
|
||||||
init_res_key(&key, pkt->ans[0].type, &pkt->ans[0].name);
|
init_res_key(&key, pkt->ans[0].type, &pkt->ans[0].name);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
/* Make sure name is not too long. */
|
/* Make sure name is not too long. */
|
||||||
PJ_ASSERT_RETURN(pkt->q[0].name.slen < PJ_MAX_HOSTNAME,
|
PJ_ASSERT_ON_FAIL(pkt->q[0].name.slen < PJ_MAX_HOSTNAME,
|
||||||
PJ_ENAMETOOLONG);
|
{ pj_grp_lock_release(resolver->grp_lock); return PJ_ENAMETOOLONG; });
|
||||||
|
|
||||||
init_res_key(&key, pkt->q[0].type, &pkt->q[0].name);
|
init_res_key(&key, pkt->q[0].type, &pkt->q[0].name);
|
||||||
}
|
}
|
||||||
|
|
|
@ -495,6 +495,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_destroy( pj_ioqueue_t *ioqueue )
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
pj_lock_release(ioqueue->lock);
|
||||||
if (ioqueue->auto_delete_lock)
|
if (ioqueue->auto_delete_lock)
|
||||||
pj_lock_destroy(ioqueue->lock);
|
pj_lock_destroy(ioqueue->lock);
|
||||||
|
|
||||||
|
|
|
@ -220,6 +220,7 @@ static void cpool_release_pool( pj_pool_factory *pf, pj_pool_t *pool)
|
||||||
#if PJ_SAFE_POOL
|
#if PJ_SAFE_POOL
|
||||||
/* Make sure pool is still in our used list */
|
/* Make sure pool is still in our used list */
|
||||||
if (pj_list_find_node(&cp->used_list, pool) != pool) {
|
if (pj_list_find_node(&cp->used_list, pool) != pool) {
|
||||||
|
pj_lock_release(cp->lock);
|
||||||
pj_assert(!"Attempt to destroy pool that has been destroyed before");
|
pj_assert(!"Attempt to destroy pool that has been destroyed before");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -664,7 +664,9 @@ PJ_DEF(pj_status_t) pj_turn_session_set_server( pj_turn_session *sess,
|
||||||
unsigned i, cnt;
|
unsigned i, cnt;
|
||||||
|
|
||||||
/* Default port must be specified */
|
/* Default port must be specified */
|
||||||
PJ_ASSERT_RETURN(default_port>0 && default_port<65536, PJ_EINVAL);
|
PJ_ASSERT_ON_FAIL(default_port>0 && default_port<65536,
|
||||||
|
{status=PJ_EINVAL; goto on_return;});
|
||||||
|
|
||||||
sess->default_port = (pj_uint16_t)default_port;
|
sess->default_port = (pj_uint16_t)default_port;
|
||||||
|
|
||||||
cnt = PJ_TURN_MAX_DNS_SRV_CNT;
|
cnt = PJ_TURN_MAX_DNS_SRV_CNT;
|
||||||
|
|
|
@ -1283,8 +1283,10 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,
|
||||||
/* Allocate new entry for the freelist. */
|
/* Allocate new entry for the freelist. */
|
||||||
for (; i < PJSIP_TRANSPORT_ENTRY_ALLOC_CNT; ++i) {
|
for (; i < PJSIP_TRANSPORT_ENTRY_ALLOC_CNT; ++i) {
|
||||||
tp_add = PJ_POOL_ZALLOC_T(mgr->pool, transport);
|
tp_add = PJ_POOL_ZALLOC_T(mgr->pool, transport);
|
||||||
if (!tp_add)
|
if (!tp_add){
|
||||||
|
pj_lock_release(mgr->lock);
|
||||||
return PJ_ENOMEM;
|
return PJ_ENOMEM;
|
||||||
|
}
|
||||||
pj_list_init(tp_add);
|
pj_list_init(tp_add);
|
||||||
pj_list_push_back(&mgr->tp_entry_freelist, tp_add);
|
pj_list_push_back(&mgr->tp_entry_freelist, tp_add);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue