Merged revisions 251877 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r251877 | tilghman | 2010-03-11 14:25:02 -0600 (Thu, 11 Mar 2010) | 8 lines
  
  If the argument to the system application is quoted, ensure we remove the quotes before trying to execute.
  
  (closes issue #16842)
   Reported by: ip-rob
   Patches: 
         20100310__issue16842.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@251878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-03-11 20:27:28 +00:00
parent f6c104ca79
commit f2dfa64228

View File

@@ -67,7 +67,8 @@ static int system_exec_helper(struct ast_channel *chan, void *data, int failmode
{
int res = 0;
struct ast_str *buf = ast_str_thread_get(&buf_buf, 16);
char *cbuf;
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "System requires an argument(command)\n");
pbx_builtin_setvar_helper(chan, chanvar, "FAILURE");
@@ -78,7 +79,15 @@ static int system_exec_helper(struct ast_channel *chan, void *data, int failmode
/* Do our thing here */
ast_str_get_encoded_str(&buf, 0, (char *) data);
res = ast_safe_system(ast_str_buffer(buf));
cbuf = ast_str_buffer(buf);
if (strchr("\"'", cbuf[0]) && cbuf[ast_str_strlen(buf) - 1] == cbuf[0]) {
cbuf[ast_str_strlen(buf) - 1] = '\0';
cbuf++;
ast_log(LOG_NOTICE, "It is not necessary to quote the argument to the System application.\n");
}
res = ast_safe_system(cbuf);
if ((res < 0) && (errno != ECHILD)) {
ast_log(LOG_WARNING, "Unable to execute '%s'\n", (char *)data);