mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Merge rgagnon's pedantic string checks (apps a-m, bug #2035)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -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; | ||||
|   } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user