From: Joshua Colp <jcolp@digium.com>
Date: Wed, 24 May 2006 19:14:01 +0000 (+0000)
Subject: Fix deadlock caused by a race condition in the logger when reloading (issue #7195... 
X-Git-Tag: 1.2.9.1~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63ffcdfda2f0304b9826bfd84ce928359a273eed;p=thirdparty%2Fasterisk.git

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/branches/1.2@30033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/logger.c b/logger.c
index 0a397ff46b..0cb0f06d05 100644
--- a/logger.c
+++ b/logger.c
@@ -384,6 +384,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);
@@ -490,6 +491,7 @@ int reload_logger(int rotate)
 		}
 	}
 	ast_mutex_unlock(&loglock);
+	ast_mutex_unlock(&msglist_lock);
 
 	return res;
 }