kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix creation race of contact_status structures."

Browse Source
This commit is contained in:
zuul
2016-02-15 15:39:47 -06:00
committed by Gerrit Code Review
parent 5c400a0fed 13b6c02945
commit 23b2b7747d
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_pjsip/pjsip_options.c
View File

@@ -107,6 +107,8 @@ static void *contact_status_alloc(const char *name)
return status;
}
AST_MUTEX_DEFINE_STATIC(creation_lock);
/*!
* \brief Retrieve a ast_sip_contact_status object from sorcery creating
* one if not found.
@@ -114,6 +116,7 @@ static void *contact_status_alloc(const char *name)
struct ast_sip_contact_status *ast_res_pjsip_find_or_create_contact_status(const struct ast_sip_contact *contact)
{
struct ast_sip_contact_status *status;
SCOPED_MUTEX(lock, &creation_lock);
status = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), CONTACT_STATUS,
ast_sorcery_object_get_id(contact));

16
res/res_sorcery_memory.c
View File

@@ -98,7 +98,21 @@ static int sorcery_memory_cmp(void *obj, void *arg, int flags)
static int sorcery_memory_create(const struct ast_sorcery *sorcery, void *data, void *object)
{
ao2_link(data, object);
void *existing;
ao2_lock(data);
existing = ao2_find(data, ast_sorcery_object_get_id(object), OBJ_KEY | OBJ_NOLOCK);
if (existing) {
ao2_ref(existing, -1);
ao2_unlock(data);
return -1;
}
ao2_link_flags(data, object, OBJ_NOLOCK);
ao2_unlock(data);
return 0;
}