From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 10 Feb 2010 15:38:27 +0000 (+0000)
Subject: Merged revisions 246022 via svnmerge from
X-Git-Tag: 1.6.1.18-rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5461c8198e6ee571fdf4b209f8fb6055eac31c7;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@246024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 29fc6bdd37..ce54cd85f8 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.