From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 15 Mar 2008 16:21:04 +0000 (+0000)
Subject: Remove a double write lock of the contexts lock in ast_wrlock_contexts().
X-Git-Tag: 1.6.0-beta7~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=072eb8a913fb51bf9a45ce67f498868f07503525;p=thirdparty%2Fasterisk.git

Remove a double write lock of the contexts lock in ast_wrlock_contexts().
How did this ever work?

(closes issue #12219)
Reported by: ys
Patches:
      pbx.c.diff uploaded by ys (license 281)


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

diff --git a/main/pbx.c b/main/pbx.c
index 029b68b8a5..d32994fe79 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7823,7 +7823,7 @@ int ast_wrlock_contexts()
 	int res = ast_rwlock_wrlock(&conlock);
 	if (!res)
 		ast_atomic_fetchadd_int(&conlock_wrlock_version, 1);
-	return ast_rwlock_wrlock(&conlock);
+	return res;
 }
 
 int ast_rdlock_contexts()