summaryrefslogtreecommitdiff
path: root/main/app.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2007-09-25 14:18:09 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2007-09-25 14:18:09 +0000
commit0efe82bf9ec2f90ee56adb7112aa9352897639b5 (patch)
tree0586a2fade7aa46c751ffbecbf7079a6df0697be /main/app.c
parent20a71bad79bac38781f6866174169ea49bf8c518 (diff)
Merged revisions 83773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r83773 | tilghman | 2007-09-25 09:13:25 -0500 (Tue, 25 Sep 2007) | 2 lines jmls pointed out that unsetting the group and setting the group to the blank string aren't quite the same. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/app.c')
-rw-r--r--main/app.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/app.c b/main/app.c
index 50a407ada..cee7553fb 100644
--- a/main/app.c
+++ b/main/app.c
@@ -876,7 +876,9 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data)
}
AST_RWLIST_TRAVERSE_SAFE_END
- if ((gi = calloc(1, len))) {
+ if (ast_strlen_zero(group)) {
+ /* Enable unsetting the group */
+ } else if ((gi = calloc(1, len))) {
gi->chan = chan;
gi->group = (char *) gi + sizeof(*gi);
strcpy(gi->group, group);