diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 00:45:32 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-04 00:45:32 +0000 |
| commit | b8561c6bafe514182f41cb1b6c6ef117723278a6 (patch) | |
| tree | d9e0b158de26c419efc48a4b80e7001ae41d2fba /main/pbx.c | |
| parent | 235607739e1d52278a4480059081950117794b90 (diff) | |
Merged revisions 173311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r173311 | tilghman | 2009-02-03 18:43:52 -0600 (Tue, 03 Feb 2009) | 10 lines
Ensure that commas placed in the middle of extension character classes do not
interfere with correct parsing of the extension. Also, if an unterminated
character class DOES make its way into the pbx core (through some other
method), ensure that it does not crash Asterisk.
(closes issue #14362)
Reported by: Nick_Lewis
Patches:
20090129__bug14362.diff.txt uploaded by Corydon76 (license 14)
Tested by: Corydon76
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@173312 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c index b2b3dba17..2828a6bf1 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1505,6 +1505,9 @@ static struct match_char *add_exten_to_pattern_tree(struct ast_context *con, str *s2++ = s3; } s1++; s1++; + } else if (*s1 == '\0') { + ast_log(LOG_WARNING, "A matching ']' was not found for '[' in pattern string '%s'\n", extenbuf); + break; } else { *s2++ = *s1++; } |