kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-19 16:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure the thread-safety of the monexec variable in app_queue.

Browse Source 
Thanks to Russell for pointing out the problem



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-06-27 16:16:13 +00:00
parent ed8698e493
commit ab7809ace9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_queue.c
View File

@@ -3541,10 +3541,15 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
if (!qe->parent->montype) { if (!qe->parent->montype) {
const char *monexec, *monargs; const char *monexec, *monargs;
ast_debug(1, "Starting Monitor as requested.\n"); ast_debug(1, "Starting Monitor as requested.\n");
if ((monexec = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC")) || (monargs = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC_ARGS"))) ast_channel_lock(qe->chan);
if ((monexec = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC")) || (monargs = pbx_builtin_getvar_helper(qe->chan, "MONITOR_EXEC_ARGS"))) {
which = qe->chan; which = qe->chan;
monexec = monexec ? ast_strdupa(monexec) : NULL;
}
else else
which = peer; which = peer;
ast_log(LOG_NOTICE, "poop\n");
ast_channel_unlock(qe->chan);
if (monitorfilename) if (monitorfilename)
ast_monitor_start(which, qe->parent->monfmt, monitorfilename, 1, X_REC_IN | X_REC_OUT); ast_monitor_start(which, qe->parent->monfmt, monitorfilename, 1, X_REC_IN | X_REC_OUT);
else if (qe->chan->cdr) else if (qe->chan->cdr)