[svn-commits] branch 1.2 r30033 - /branches/1.2/logger.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed May 24 14:14:01 2006
New Revision: 30033

URL: http://svn.digium.com/view/asterisk?rev=30033&view=rev
Log:
Fix deadlock caused by a race condition in the logger when reloading (issue #7195 reported and fixed by softins)

Modified:
    branches/1.2/logger.c

Modified: branches/1.2/logger.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/logger.c?rev=30033&r1=30032&r2=30033&view=diff
==============================================================================
--- branches/1.2/logger.c (original)
+++ branches/1.2/logger.c Wed May 24 14:14:01 2006
@@ -384,6 +384,7 @@
 	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 @@
 		}
 	}
 	ast_mutex_unlock(&loglock);
+	ast_mutex_unlock(&msglist_lock);
 
 	return res;
 }