From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 7 Dec 2007 21:17:52 +0000 (+0000)
Subject: Merged revisions 91828 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~498
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90614c7018aa7e920ba6d58e8b7468a0e0b5a505;p=thirdparty%2Fasterisk.git

Merged revisions 91828 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r91828 | russell | 2007-12-07 15:17:24 -0600 (Fri, 07 Dec 2007) | 6 lines

Fix another bug in the DEBUG_THREADS code.  The ast_mutex_init() function had
the mutex attribute object marked as static.  This means that multiple threads
initializing locks at the same time could step on each other and end up with
improperly initialized locks.
(found when tracking down locking issues related to issue #11080)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index d4870b9664..3695d23a72 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -213,7 +213,7 @@ static inline int __ast_pthread_mutex_init(int track, const char *filename, int
 						const char *mutex_name, ast_mutex_t *t) 
 {
 	int res;
-	static pthread_mutexattr_t  attr;
+	pthread_mutexattr_t  attr;
 
 #ifdef AST_MUTEX_INIT_W_CONSTRUCTORS