diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-04-30 19:21:04 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-04-30 19:21:04 +0000 |
| commit | 527c601d0cf28b0b062a1e6d1ea1ec02cb9568dd (patch) | |
| tree | 89d592fc9e276ed41a21062589ea44fedcf6d0d2 /apps/app_chanspy.c | |
| parent | 4c3aecfc55663f0ed9d441aa2d2b2d4ddd35e28e (diff) | |
Lock around variables retrieved, and copy the values, if they stay persistent,
since another thread could remove them.
(closes issue #12541)
Reported by: snuffy
Patches:
bug_12156_apps.diff uploaded by snuffy (license 35)
Several additional changes by me
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_chanspy.c')
| -rw-r--r-- | apps/app_chanspy.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index d77fa4bbc..82c7afcef 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -596,12 +596,15 @@ static int common_exec(struct ast_channel *chan, const struct ast_flags *flags, if (ast_test_flag(flags, OPTION_EXIT)) { const char *c; - if ((c = pbx_builtin_getvar_helper(chan, "SPY_EXIT_CONTEXT"))) + ast_channel_lock(chan); + if ((c = pbx_builtin_getvar_helper(chan, "SPY_EXIT_CONTEXT"))) { ast_copy_string(exitcontext, c, sizeof(exitcontext)); - else if (!ast_strlen_zero(chan->macrocontext)) + } else if (!ast_strlen_zero(chan->macrocontext)) { ast_copy_string(exitcontext, chan->macrocontext, sizeof(exitcontext)); - else + } else { ast_copy_string(exitcontext, chan->context, sizeof(exitcontext)); + } + ast_channel_unlock(chan); } ast_mutex_init(&chanspy_ds.lock); |