diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-14 07:22:30 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-07-14 07:22:30 +0000 |
commit | 59d780973e0c1aab681be9dcba1baa2706caf92f (patch) | |
tree | 069cf4d5aa497e953fd1467abefc88134b3fc727 /apps/app_macro.c | |
parent | 8e06b188edfed3926b0e640a2294525b3488ccdf (diff) |
Merge rgagnon's pedantic string checks (apps a-m, bug #2035)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3428 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
-rwxr-xr-x | apps/app_macro.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index dd53946bd..ea6775c90 100755 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -122,8 +122,9 @@ static int macro_exec(struct ast_channel *chan, void *data) pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", NULL); /* Setup environment for new run */ - strcpy(chan->exten, "s"); - strncpy(chan->context, fullmacro, sizeof(chan->context)); + chan->exten[0] = 's'; + chan->exten[1] = '\0'; + strncpy(chan->context, fullmacro, sizeof(chan->context) - 1); chan->priority = 1; while((cur = strsep(&rest, "|")) && (argc < MAX_ARGS)) { @@ -193,8 +194,8 @@ out: pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority); if (save_macro_priority) free(save_macro_priority); if (setmacrocontext) { - strcpy(chan->macrocontext, ""); - strcpy(chan->macroexten, ""); + chan->macrocontext[0] = '\0'; + chan->macroexten[0] = '\0'; chan->macropriority = 0; } |