mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
Opaquify char * and char[] in ast_channel
Review: https://reviewboard.asterisk.org/r/1733/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@354968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -779,10 +779,10 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
|
||||
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)) {
|
||||
ast_copy_string(exitcontext, chan->macrocontext, sizeof(exitcontext));
|
||||
} else if (!ast_strlen_zero(ast_channel_macrocontext(chan))) {
|
||||
ast_copy_string(exitcontext, ast_channel_macrocontext(chan), sizeof(exitcontext));
|
||||
} else {
|
||||
ast_copy_string(exitcontext, chan->context, sizeof(exitcontext));
|
||||
ast_copy_string(exitcontext, ast_channel_context(chan), sizeof(exitcontext));
|
||||
}
|
||||
ast_channel_unlock(chan);
|
||||
}
|
||||
@@ -1186,7 +1186,7 @@ static int extenspy_exec(struct ast_channel *chan, const char *data)
|
||||
args.context = ptr;
|
||||
}
|
||||
if (ast_strlen_zero(args.context))
|
||||
args.context = ast_strdupa(chan->context);
|
||||
args.context = ast_strdupa(ast_channel_context(chan));
|
||||
|
||||
if (args.options) {
|
||||
char *opts[OPT_ARG_ARRAY_SIZE];
|
||||
|
Reference in New Issue
Block a user