aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-16 00:38:36 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-16 00:38:36 +0000
commit77beb7751e6edc9bcd8b1476db95ba7e85a90d56 (patch)
tree88959bf3bc8b9e84dea9751d801e3f4402e90130
parenta92e8ebf8cf61b49417bf0ea1ebe2669e2194edb (diff)
Merged revisions 168746 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r168746 | murf | 2009-01-15 17:34:31 -0700 (Thu, 15 Jan 2009) | 20 lines Merged revisions 168745 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r168745 | murf | 2009-01-15 17:19:12 -0700 (Thu, 15 Jan 2009) | 14 lines This patch fixes a problem where a goto (or jump, in this case) fails a consistency check because it can't find a matching extension. The problem was a missing instruction to end the range notation in the code where it converts the pattern into a regex and uses the regex code to determine the match. I tested using the AEL code the user supplied, and now, the consistency check passes. (closes issue #14141) Reported by: dimas ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@168747 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/ael/pval.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/res/ael/pval.c b/res/ael/pval.c
index e29cf5600..606866d3f 100644
--- a/res/ael/pval.c
+++ b/res/ael/pval.c
@@ -744,6 +744,7 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
while ( *p && *p != ']' ) {
*r++ = *p++;
}
+ *r++ = ']';
if ( *p != ']') {
ast_log(LOG_WARNING, "Warning: file %s, line %d-%d: The extension pattern '%s' is missing a closing bracket \n",
here->filename, here->startline, here->endline, pattern);