[asterisk-commits] qwell: branch 1.6.0 r125590 - in /branches/1.6.0: ./ main/utils.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Jun 26 18:05:04 2008
New Revision: 125590

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125590
Log:
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?
........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/utils.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/utils.c?view=diff&rev=125590&r1=125589&r2=125590
==============================================================================
--- branches/1.6.0/main/utils.c (original)
+++ branches/1.6.0/main/utils.c Thu Jun 26 18:05:04 2008
@@ -701,6 +701,9 @@
 	*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;
 }