diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-26 23:05:04 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-26 23:05:04 +0000 |
commit | 4fdf8edbaa552ca6c164c37fb124e22f0e33da08 (patch) | |
tree | 5cb3c994187fce0cbe18fc3bd6284feb04ee7e2b /main/utils.c | |
parent | a575964e208ffce175fd928c1727b0ef8ba208a9 (diff) |
Merged revisions 125589 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r125589 | qwell | 2008-06-26 18:04:18 -0500 (Thu, 26 Jun 2008) | 9 lines
Merged revisions 125587 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r125587 | qwell | 2008-06-26 18:03:15 -0500 (Thu, 26 Jun 2008) | 1 line
Make sure to unlock the lock_info lock (huh?). Possible deadlock?
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125590 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/utils.c')
-rw-r--r-- | main/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/utils.c b/main/utils.c index 668df5066..d3f803b28 100644 --- a/main/utils.c +++ b/main/utils.c @@ -701,6 +701,9 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons *lineno = lock_info->locks[i].line_num; *func = lock_info->locks[i].func; *mutex_name = lock_info->locks[i].lock_name; + + pthread_mutex_unlock(&lock_info->lock); + return 0; } |