[asterisk-commits] file: branch file/bridging r111849 - /team/file/bridging/apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Mar 28 15:37:04 2008
New Revision: 111849

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111849
Log:
ast_strdupa didn't like that...

Modified:
    team/file/bridging/apps/app_confbridge.c

Modified: team/file/bridging/apps/app_confbridge.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/apps/app_confbridge.c?view=diff&rev=111849&r1=111848&r2=111849
==============================================================================
--- team/file/bridging/apps/app_confbridge.c (original)
+++ team/file/bridging/apps/app_confbridge.c Fri Mar 28 15:37:04 2008
@@ -559,7 +559,7 @@
 	struct conference_bridge_user conference_bridge_user = {
 		.chan = chan,
 	};
-	const char *join_sound, *leave_sound;
+	const char *tmp, *join_sound = NULL, *leave_sound = NULL;
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(conf_name);
 		AST_APP_ARG(options);
@@ -603,8 +603,12 @@
 
 	/* Grab join/leave sounds from the channel */
 	ast_channel_lock(chan);
-	join_sound = ast_strdupa(pbx_builtin_getvar_helper(chan, "CONFBRIDGE_JOIN_SOUND"));
-	leave_sound = ast_strdupa(pbx_builtin_getvar_helper(chan, "CONFBRIDGE_LEAVE_SOUND"));
+	if ((tmp = pbx_builtin_getvar_helper(chan, "CONFBRIDGE_JOIN_SOUND"))) {
+		join_sound = ast_strdupa(tmp);
+	}
+	if ((tmp = pbx_builtin_getvar_helper(chan, "CONFBRIDGE_LEAVE_SOUND"))) {
+		leave_sound = ast_strdupa(tmp);
+	}
 	ast_channel_unlock(chan);
 
 	/* If there is 1 or more people already in the conference then play our join sound unless overridden */