From: Kevin P. Fleming <kpfleming@digium.com>
Date: Thu, 28 Sep 2006 17:31:57 +0000 (+0000)
Subject: fix buggy (and overly complex) loop used during reload of app_queue for static member... 
X-Git-Tag: 1.2.13~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7620e04612b4e264a917947ea3375e34928dda30;p=thirdparty%2Fasterisk.git

fix buggy (and overly complex) loop used during reload of app_queue for static member list updating


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 1a12bceebe..ec53d66415 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3306,7 +3306,7 @@ static void reload_queues(void)
 	struct ast_config *cfg;
 	char *cat, *tmp;
 	struct ast_variable *var;
-	struct member *prev, *cur, *newm;
+	struct member *prev, *cur, *newm, *next;
 	int new;
 	char *general_val = NULL;
 	char interface[80];
@@ -3405,23 +3405,21 @@ static void reload_queues(void)
 				}
 
 				/* Free remaining members marked as delme */
-				for (prev = NULL, newm = NULL, cur = q->members; cur; prev = cur, cur = cur->next) {
-					if (newm) {
-						free(newm);
-						newm = NULL;
-					}
-
-					if (cur->delme) {
-						if (prev) {
-							prev->next = cur->next;
-							newm = cur;
-						} else {
-							q->members = cur->next;
-							newm = cur;
-						}
-						remove_from_interfaces(cur->interface);
-					}
+				for (prev = NULL, cur = q->members, next = cur ? cur->next : NULL;
+				     cur;
+				     cur = next, next = cur ? cur->next : NULL) {
+					if (!cur->delme)
+						continue;
+
+					if (prev)
+						prev->next = next;
+					else
+						q->members = next;
+
+					remove_from_interfaces(cur->interface);
+					free(cur);
 				}
+
 				if (!new) 
 					ast_mutex_unlock(&q->lock);
 				if (new) {