From: Jonathan Rose <jrose@digium.com>
Date: Thu, 15 Nov 2012 21:48:33 +0000 (+0000)
Subject: app_queue: Fix a lock that was being held forever caused by a merging mistake
X-Git-Tag: certified/1.8.11-cert9-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e5e90c32891056a80ad74d05bd8dd737383d6c;p=thirdparty%2Fasterisk.git

app_queue: Fix a lock that was being held forever caused by a merging mistake

r375591 merged with conflicts and an oversight resulted in an unlock being
missed which resulted in a deadlock when updating realtime members in queues.
This patch adds that unlock back in.

(closes issue AST-1035)
Reported by: Steve Pitts
Patches:
    certified_1.8.11_oops_missed_an_unlock.diff uploaded by Jonathan Rose (license 6182)


git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.11@376302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 7271b1509c..a59898b8e4 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2498,6 +2498,7 @@ static void update_realtime_members(struct call_queue *q)
 			ao2_ref(m, -1);
 		}
 		ast_debug(3, "Queue %s has no realtime members defined. No need for update\n", q->name);
+		ao2_unlock(q);
 		return;
 	}