diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-03-11 20:25:02 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-03-11 20:25:02 +0000 |
| commit | 74be58a31f0ae721743c788a104328e3757bc205 (patch) | |
| tree | 1c3d429315677d81373a86b7e2df8e3191dd76ac /apps/app_system.c | |
| parent | 7f68a324178f7a2c904ffb24cff3c42f8bd1075c (diff) | |
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/trunk@251877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_system.c')
| -rw-r--r-- | apps/app_system.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/apps/app_system.c b/apps/app_system.c index 6fa2fc962..b5fee94b5 100644 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -104,7 +104,8 @@ static int system_exec_helper(struct ast_channel *chan, const char *data, int fa { 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"); @@ -115,7 +116,15 @@ static int system_exec_helper(struct ast_channel *chan, const char *data, int fa /* 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); |