kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "taskprocessor: Fix race condition between unreferencing and finding." into 13

Browse Source
This commit is contained in:
Matt Jordan
2015-08-29 12:31:55 -05:00
committed by Gerrit Code Review
parent 545795ae0d a676ba2aad
commit 45b06a648b
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/taskprocessor.c
View File

@@ -691,15 +691,25 @@ void *ast_taskprocessor_unreference(struct ast_taskprocessor *tps)
return NULL; return NULL;
} }
/* To prevent another thread from finding and getting a reference to this
* taskprocessor we hold the singletons lock. If we didn't do this then
* they may acquire it and find that the listener has been shut down.
*/
ao2_lock(tps_singletons);
if (ao2_ref(tps, -1) > 3) { if (ao2_ref(tps, -1) > 3) {
ao2_unlock(tps_singletons);
return NULL; return NULL;
} }
/* If we're down to 3 references, then those must be: /* If we're down to 3 references, then those must be:
* 1. The reference we just got rid of * 1. The reference we just got rid of
* 2. The container * 2. The container
* 3. The listener * 3. The listener
*/ */
ao2_unlink(tps_singletons, tps); ao2_unlink_flags(tps_singletons, tps, OBJ_NOLOCK);
ao2_unlock(tps_singletons);
listener_shutdown(tps->listener); listener_shutdown(tps->listener);
return NULL; return NULL;
} }