From: Steve Murphy Date: Fri, 16 Jan 2009 00:34:31 +0000 (+0000) Subject: Merged revisions 168745 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~428 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdfda9ea23b3323c72cedd5733d94e6f6539f607;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/trunk@168746 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/ael/pval.c b/res/ael/pval.c index 8ee603aaed..20e5eddc30 100644 --- a/res/ael/pval.c +++ b/res/ael/pval.c @@ -745,6 +745,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);