From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 25 Sep 2007 14:18:09 +0000 (+0000)
Subject: Merged revisions 83773 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1322
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0efe82bf9ec2f90ee56adb7112aa9352897639b5;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/app.c b/main/app.c
index 50a407adad..cee7553fb4 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);