diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-10 15:38:19 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-10 15:38:19 +0000 |
| commit | 5e29f301c8563f97a3d25e5097985d1e1f3ab489 (patch) | |
| tree | c17fa5d2bef4129207a746163d9759ec6cfb3dbc | |
| parent | 873529b5182895547c19fac3c2ed4216e4ac894e (diff) | |
Merged revisions 246022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r246022 | tilghman | 2010-02-10 09:36:57 -0600 (Wed, 10 Feb 2010) | 2 lines
Enable warnings on atypical conditions for the FILTER function (suggested by mmichelson on the -dev list).
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@246023 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | funcs/func_strings.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 809d8e74d..c7ed460ac 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -99,6 +99,10 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char * return -1; } + if (args.allowed[0] == '"' && !ast_opt_dont_warn) { + ast_log(LOG_WARNING, "FILTER allowed characters includes the quote (\") character. This may not be what you want.\n"); + } + /* Expand ranges */ for (; *(args.allowed) && allowedlen < sizeof(allowed); ) { char c1 = 0, c2 = 0; @@ -113,6 +117,10 @@ static int filter(struct ast_channel *chan, const char *cmd, char *parse, char * c2 = -1; args.allowed += consumed + 1; + if ((c2 < c1 || c2 == -1) && !ast_opt_dont_warn) { + ast_log(LOG_WARNING, "Range wrapping in FILTER(%s,%s). This may not be what you want.\n", parse, args.string); + } + /*!\note * Looks a little strange, until you realize that we can overflow * the size of a char. |