[Asterisk-cvs] asterisk channel.c,1.165,1.166

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv32384

Modified Files:
	channel.c 
Log Message:
Handle masq properly when clone channel has no vars (bug 3344)


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- channel.c	13 Jan 2005 03:31:58 -0000	1.165
+++ channel.c	15 Jan 2005 06:37:51 -0000	1.166
@@ -2317,7 +2317,8 @@
 
 	/* Append variables from clone channel into original channel */
 	/* XXX Is this always correct?  We have to in order to keep MACROS working XXX */
-	AST_LIST_INSERT_TAIL(&original->varshead, AST_LIST_FIRST(&clone->varshead), entries);
+	if (AST_LIST_FIRST(&clone->varshead))
+		AST_LIST_INSERT_TAIL(&original->varshead, AST_LIST_FIRST(&clone->varshead), entries);
 }
 
 /* Assumes channel will be locked when called */