From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 2 Dec 2007 18:20:13 +0000 (+0000)
Subject: Merged revisions 90470 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~587
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f5117be2ec3fd0fa155bbddd2e8044eb218311a;p=thirdparty%2Fasterisk.git

Merged revisions 90470 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r90470 | russell | 2007-12-02 12:18:52 -0600 (Sun, 02 Dec 2007) | 6 lines

The other day when I went through making changes as a result of the ao2_link()
change, I added some code to set pointers to NULL after they were unreferenced.
This pointed out that in this place, the object was unreferenced before the
code was done using it.  So, move the unref down a little bit.
(crash reported by jmls on IRC)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@90471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 8be6a30458..441eab0213 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3384,8 +3384,6 @@ static int add_to_queue(const char *queuename, const char *interface, const char
 		if ((new_member = create_queue_member(interface, membername, penalty, paused))) {
 			new_member->dynamic = 1;
 			ao2_link(q->members, new_member);
-			ao2_ref(new_member, -1);
-			new_member = NULL;
 			q->membercount++;
 			manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded",
 				"Queue: %s\r\n"
@@ -3402,6 +3400,9 @@ static int add_to_queue(const char *queuename, const char *interface, const char
 				new_member->penalty, new_member->calls, (int) new_member->lastcall,
 				new_member->status, new_member->paused);
 			
+			ao2_ref(new_member, -1);
+			new_member = NULL;
+
 			if (dump)
 				dump_queue_members(q);