From 1fbfd723e82dd7bad85aafda0e77bec98a602537 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 27 Jun 2008 16:19:16 +0000 Subject: [PATCH] Merged revisions 125855 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r125855 | mmichelson | 2008-06-27 11:16:13 -0500 (Fri, 27 Jun 2008) | 5 lines Ensure the thread-safety of the monexec variable in app_queue. Thanks to Russell for pointing out the problem ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@125859 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/apps/app_queue.c b/apps/app_queue.c index 74e7c581db..dd4750640d 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3489,11 +3489,18 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce if (!qe->parent->montype) { const char *monexec, *monargs; ast_debug(1, "Starting Monitor as requested.\n"); + ast_channel_lock(qe->chan); monitorfilename = pbx_builtin_getvar_helper(qe->chan, "MONITOR_FILENAME"); - if ((monexec = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC")) || (monargs = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC_ARGS"))) + if (monitorfilename) { + monitorfilename = ast_strdupa(monitorfilename); + } + if ((monexec = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC")) || (monargs = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC_ARGS"))) { which = qe->chan; + monexec = monexec ? ast_strdupa(monexec) : NULL; + } else which = peer; + ast_channel_unlock(qe->chan); if (monitorfilename) ast_monitor_start(which, qe->parent->monfmt, monitorfilename, 1, X_REC_IN | X_REC_OUT); else if (qe->chan->cdr)