From eda57ca8ae1d04ccc1488253230653556170f498 Mon Sep 17 00:00:00 2001 From: tilghman Date: Tue, 25 Sep 2007 14:18:09 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/trunk@83774 f38db490-d61c-443f-a65b-d21fe96a405b --- main/app.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'main/app.c') 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); -- cgit v1.2.3