kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 20:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@30033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-05-24 19:14:01 +00:00
parent e9d164d468
commit 63ffcdfda2
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logger.c
View File

@@ -384,6 +384,7 @@ int reload_logger(int rotate)
FILE *myf; FILE *myf;
int x, res = 0; int x, res = 0;
ast_mutex_lock(&msglist_lock); /* to avoid deadlock */
ast_mutex_lock(&loglock); ast_mutex_lock(&loglock);
if (eventlog) if (eventlog)
fclose(eventlog); fclose(eventlog);
@@ -490,6 +491,7 @@ int reload_logger(int rotate)
} }
} }
ast_mutex_unlock(&loglock); ast_mutex_unlock(&loglock);
ast_mutex_unlock(&msglist_lock);
return res; return res;
} }