[asterisk-commits] file: branch group/media_formats r406937 - /team/group/media_formats/main/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jan 30 14:36:51 2014
New Revision: 406937

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406937
Log:
Fix a deadlock due to recursively trying to lock an rwlock.

Modified:
    team/group/media_formats/main/format_cache.c

Modified: team/group/media_formats/main/format_cache.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats/main/format_cache.c?view=diff&rev=406937&r1=406936&r2=406937
==============================================================================
--- team/group/media_formats/main/format_cache.c (original)
+++ team/group/media_formats/main/format_cache.c Thu Jan 30 14:36:51 2014
@@ -152,7 +152,7 @@
 	strcpy(cached_format->name, name);
 	cached_format->format = ao2_bump(format);
 
-	ao2_link(formats, cached_format);
+	ao2_link_flags(formats, cached_format, OBJ_NOLOCK);
 	ao2_ref(cached_format, -1);
 
 	ast_verb(2, "Created cached format with name '%s'\n", name);