From: Jason Parker Date: Thu, 26 Jun 2008 23:04:18 +0000 (+0000) Subject: Merged revisions 125587 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~1890 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e4f50f54061c8f81bed5003aae81e2f6fe38c1;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/trunk@125589 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/utils.c b/main/utils.c index 4b9869984c..d4adaf9791 100644 --- a/main/utils.c +++ b/main/utils.c @@ -717,6 +717,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; }