[svn-commits] mmichelson: branch 1.6.0 r125859 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Jun 27 11:19:16 2008
New Revision: 125859

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125859
Log:
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


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=125859&r1=125858&r2=125859
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Fri Jun 27 11:19:16 2008
@@ -3489,11 +3489,18 @@
 			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)