diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 17:42:16 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-20 17:42:16 +0000 |
commit | f3d699283df5929c3c91e6873dec74227cca037a (patch) | |
tree | 58c78ca8f1c4a356ba0618aab97708d50dcc8e62 | |
parent | 329bc3e42ae8888f64ae13cffe8bca772dfb27da (diff) |
Merged revisions 177664 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r177664 | tilghman | 2009-02-20 11:29:51 -0600 (Fri, 20 Feb 2009) | 8 lines
Allow semicolons to be escaped, when passing arguments to the System command.
(closes issue #14231)
Reported by: jcovert
Patches:
20090113__bug14231__2.diff.txt uploaded by Corydon76 (license 14)
corrected_20090113__bug14231__2.diff.txt uploaded by jcovert (license 551)
Tested by: jcovert
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@177665 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_system.c | 9 | ||||
-rw-r--r-- | include/asterisk/app.h | 3 | ||||
-rw-r--r-- | include/asterisk/strings.h | 5 | ||||
-rw-r--r-- | main/app.c | 28 |
4 files changed, 44 insertions, 1 deletions
diff --git a/apps/app_system.c b/apps/app_system.c index 1f39c5a4e..6022b1728 100644 --- a/apps/app_system.c +++ b/apps/app_system.c @@ -33,6 +33,10 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/module.h" #include "asterisk/app.h" #include "asterisk/channel.h" /* autoservice */ +#include "asterisk/strings.h" +#include "asterisk/threadstorage.h" + +AST_THREADSTORAGE(buf_buf); static char *app = "System"; @@ -62,6 +66,7 @@ static char *descrip2 = 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); if (ast_strlen_zero(data)) { ast_log(LOG_WARNING, "System requires an argument(command)\n"); @@ -72,7 +77,9 @@ static int system_exec_helper(struct ast_channel *chan, void *data, int failmode ast_autoservice_start(chan); /* Do our thing here */ - res = ast_safe_system((char *)data); + ast_str_get_encoded_str(&buf, 0, (char *) data); + res = ast_safe_system(ast_str_buffer(buf)); + if ((res < 0) && (errno != ECHILD)) { ast_log(LOG_WARNING, "Unable to execute '%s'\n", (char *)data); pbx_builtin_setvar_helper(chan, chanvar, "FAILURE"); diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 510a57871..470566e9f 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -483,6 +483,9 @@ int ast_get_encoded_char(const char *stream, char *result, size_t *consumed); /*! \brief Decode a string which may contain multiple encoded control or extended ASCII characters */ int ast_get_encoded_str(const char *stream, char *result, size_t result_size); +/*! \brief Decode a stream of encoded control or extended ASCII characters */ +int ast_str_get_encoded_str(struct ast_str **str, int maxlen, const char *stream); + #if defined(__cplusplus) || defined(c_plusplus) } #endif diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 8de2695ba..e145e2b90 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -351,6 +351,11 @@ struct ast_str { char str[0]; /*!< The string buffer */ }; +#define ast_str_size(a) ((a)->len) +#define ast_str_strlen(a) ((a)->used) +#define ast_str_buffer(a) ((a)->str) +#define ast_str_update(a) (a)->used = strlen((a)->str) + /*! * \brief Create a malloc'ed dynamic length string * diff --git a/main/app.c b/main/app.c index c9721d58b..3604c6352 100644 --- a/main/app.c +++ b/main/app.c @@ -43,6 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/lock.h" #include "asterisk/indications.h" #include "asterisk/linkedlists.h" +#include "asterisk/strings.h" #define MAX_OTHER_FORMATS 10 @@ -1788,3 +1789,30 @@ int ast_get_encoded_str(const char *stream, char *result, size_t result_size) return 0; } +int ast_str_get_encoded_str(struct ast_str **str, int maxlen, const char *stream) +{ + char next, *buf; + size_t offset = 0; + size_t consumed; + + if (strchr(stream, '\\')) { + while (!ast_get_encoded_char(stream, &next, &consumed)) { + if (offset + 2 > ast_str_size(*str) && maxlen > -1) { + ast_str_make_space(str, maxlen > 0 ? maxlen : (ast_str_size(*str) + 48) * 2 - 48); + } + if (offset + 2 > ast_str_size(*str)) { + break; + } + buf = ast_str_buffer(*str); + buf[offset++] = next; + stream += consumed; + } + buf = ast_str_buffer(*str); + buf[offset++] = '\0'; + ast_str_update(*str); + } else { + ast_str_set(str, maxlen, "%s", stream); + } + return 0; +} + |