From: Joshua Colp <jcolp@digium.com>
Date: Wed, 24 May 2006 19:16:07 +0000 (+0000)
Subject: Merged revisions 30033 via svnmerge from
X-Git-Tag: 1.4.0-beta1~1218
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=519ee2511003560bf6437ed0a9152de924da92e1;p=thirdparty%2Fasterisk.git

Merged revisions 30033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r30033 | file | 2006-05-24 16:14:01 -0300 (Wed, 24 May 2006) | 2 lines

Fix deadlock caused by a race condition in the logger when reloading (issue #7195 reported and fixed by softins)

........


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

diff --git a/logger.c b/logger.c
index 522a96b2d8..e4673a7182 100644
--- a/logger.c
+++ b/logger.c
@@ -385,6 +385,7 @@ int reload_logger(int rotate)
 	FILE *myf;
 	int x, res = 0;
 
+	ast_mutex_lock(&msglist_lock);	/* to avoid deadlock */
 	ast_mutex_lock(&loglock);
 	if (eventlog) 
 		fclose(eventlog);
@@ -491,6 +492,7 @@ int reload_logger(int rotate)
 		}
 	}
 	ast_mutex_unlock(&loglock);
+	ast_mutex_unlock(&msglist_lock);
 
 	return res;
 }