From a3ec9d8f1b99fbf4bdd7a7d7da0690bde32b0ac8 Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Thu, 30 Oct 2014 23:53:26 +0000
Subject: [PATCH] app_queue: fix a couple leaks to struct call_queue in
set_member_value
set_member_value has a couple leaks to references in the variable q
found through testsuite tests/queues/set_penalty. Also remove the
REF_DEBUG_ONLY_QUEUES compiler declaration, this is no longer possible
with the updated REF_DEBUG code.
ASTERISK-24466 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4125/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@426805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_queue.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/app_queue.c b/apps/app_queue.c
index bf7bd339a2..9a08e20418 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -100,9 +100,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/cel.h"
#include "asterisk/data.h"
-/* Define, to debug reference counts on queues, without debugging reference counts on queue members */
-/* #define REF_DEBUG_ONLY_QUEUES */
-
/*!
* \par Please read before modifying this file.
* There are three locks which are regularly used
@@ -1495,7 +1492,7 @@ static void queue_member_follower_removal(struct call_queue *queue, struct membe
ao2_callback(queue->members, OBJ_NODATA | OBJ_MULTIPLE, queue_member_decrement_followers, &pos);
}
-#ifdef REF_DEBUG_ONLY_QUEUES
+#ifdef REF_DEBUG
#define queue_ref(q) _queue_ref(q, "", __FILE__, __LINE__, __PRETTY_FUNCTION__)
#define queue_unref(q) _queue_unref(q, "", __FILE__, __LINE__, __PRETTY_FUNCTION__)
#define queue_t_ref(q, tag) _queue_ref(q, tag, __FILE__, __LINE__, __PRETTY_FUNCTION__)
@@ -6546,6 +6543,7 @@ static int set_member_value(const char *queuename, const char *interface, int pr
if ((q = find_load_queue_rt_friendly(name))) {
foundqueue++;
foundinterface += set_member_value_help_members(q, interface, property, value);
+ queue_unref(q);
}
}
}
@@ -6556,12 +6554,14 @@ static int set_member_value(const char *queuename, const char *interface, int pr
while ((q = ao2_t_iterator_next(&queue_iter, "Iterate through queues"))) {
foundqueue++;
foundinterface += set_member_value_help_members(q, interface, property, value);
+ queue_unref(q);
}
ao2_iterator_destroy(&queue_iter);
} else { /* We actually have a queuename, so we can just act on the single queue. */
if ((q = find_load_queue_rt_friendly(queuename))) {
foundqueue++;
foundinterface += set_member_value_help_members(q, interface, property, value);
+ queue_unref(q);
}
}
--
GitLab