summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-06-09 19:27:19 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-06-09 19:27:19 +0000
commit8c6c774ab685aa523a61785d00d4bd92331432fc (patch)
tree2c8ef6d2eb38bc1f6087d1c4907b2abbc23fc655
parente18a7471729855f1b5aee3fe4aa279da1297d48f (diff)
fix channel walking problems from recent changes (bug #4494)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xapp.c1
-rwxr-xr-xmanager.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/app.c b/app.c
index bb21be9e8..5e5230e96 100755
--- a/app.c
+++ b/app.c
@@ -1059,7 +1059,6 @@ int ast_app_group_match_get_count(char *groupmatch, char *category)
if (test && !regexec(&regexbuf, test, 0, NULL, 0))
count++;
ast_mutex_unlock(&chan->lock);
- chan = ast_channel_walk_locked(chan);
}
regfree(&regexbuf);
diff --git a/manager.c b/manager.c
index c00658695..4f968cd19 100755
--- a/manager.c
+++ b/manager.c
@@ -753,6 +753,7 @@ static int action_status(struct mansession *s, struct message *m)
ast_state2str(c->_state), bridge, c->uniqueid, idText);
}
ast_mutex_unlock(&s->lock);
+ ast_mutex_unlock(&c->lock);
if (!all)
break;
c = ast_channel_walk_locked(c);