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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@93378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
fbd7dda5c7
commit
3bc9c162f1
|
@ -753,7 +753,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
|
|||
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 */
|
||||
|
|
Loading…
Reference in New Issue