From 4987488116711ce8e10eede0812cfc8a26ada0e4 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Mon, 17 Mar 2008 22:07:29 +0000 Subject: Merged revisions 109227 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r109227 | mmichelson | 2008-03-17 17:06:44 -0500 (Mon, 17 Mar 2008) | 20 lines Merged revisions 109226 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r109226 | mmichelson | 2008-03-17 17:05:49 -0500 (Mon, 17 Mar 2008) | 12 lines Fix a logic flaw in the code that stores lock info which is displayed via the "core show locks" command. The idea behind this section of code was to remove the previous lock from the list if it was a trylock that had failed. Unfortunately, instead of checking the status of the previous lock, we were referencing the index immediately following the previous lock in the lock_info->locks array. The result of this problem, under the right circumstances, was that the lock which we currently in the process of attempting to acquire could "overwrite" the previous lock which was acquired. While this does not in any way affect typical operation, it *could* lead to misleading "core show locks" output. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@109228 f38db490-d61c-443f-a65b-d21fe96a405b --- main/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/utils.c') diff --git a/main/utils.c b/main/utils.c index 7325963b7..c3edcd626 100644 --- a/main/utils.c +++ b/main/utils.c @@ -611,7 +611,7 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, return; } - if (i && lock_info->locks[i].pending == -1) { + if (i && lock_info->locks[i-1].pending == -1) { /* The last lock on the list was one that this thread tried to lock but * failed at doing so. It has now moved on to something else, so remove * the old lock from the list. */ -- cgit v1.2.3