[asterisk-commits] file: trunk r93378 - in /trunk: ./ main/utils.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Dec 17 16:29:56 2007
New Revision: 93378

URL: http://svn.digium.com/view/asterisk?view=rev&rev=93378
Log:
Merged revisions 93377 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r93377 | file | 2007-12-17 18:28:09 -0400 (Mon, 17 Dec 2007) | 7 lines

Do not try to access information about a lock when printing out a trylock attempt. It is possible for the lock that it references to no longer be valid. This would have caused segfaults or deadlocks.
(issue #BE-263)
(closes issue #11080)
Reported by: callguy
(closes issue #11100)
Reported by: callguy

........

Modified:
    trunk/   (props changed)
    trunk/main/utils.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/utils.c
URL: http://svn.digium.com/view/asterisk/trunk/main/utils.c?view=diff&rev=93378&r1=93377&r2=93378
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Mon Dec 17 16:29:56 2007
@@ -753,7 +753,7 @@
 				lock_info->locks[i].lock_addr, 
 				lock_info->locks[i].times_locked);
 
-			if (!lock_info->locks[i].pending)
+			if (!lock_info->locks[i].pending || lock_info->locks[i].pending == -1)
 				continue;
 
 			/* We only have further details for mutexes right now */