From 42e9e81c21ef51bc706d50d26d24afe0351421e5 Mon Sep 17 00:00:00 2001 From: Automerge Script Date: Wed, 13 Jun 2007 19:28:07 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69180 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- app.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app.c b/app.c index f997752480..33b318dd2c 100644 --- a/app.c +++ b/app.c @@ -1047,12 +1047,16 @@ int ast_app_group_set_channel(struct ast_channel *chan, char *data) len += strlen(category) + 1; AST_LIST_LOCK(&groups); - AST_LIST_TRAVERSE(&groups, gi, list) { - if (gi->chan == chan && !strcasecmp(gi->group, group) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) + AST_LIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { + if ((gi->chan == chan) && ((ast_strlen_zero(category) && ast_strlen_zero(gi->category)) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) { + AST_LIST_REMOVE_CURRENT(&groups, list); + free(gi); break; + } } + AST_LIST_TRAVERSE_SAFE_END - if (!gi && (gi = calloc(1, len))) { + if ((gi = calloc(1, len))) { gi->chan = chan; gi->group = (char *) gi + sizeof(*gi); strcpy(gi->group, group);