[asterisk-commits] murf: branch 1.6.1 r168748 - in /branches/1.6.1: ./ res/ael/pval.c

[SVN commits to the Asterisk project]

Author: murf
Date: Thu Jan 15 18:47:29 2009
New Revision: 168748

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168748
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/ael/pval.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/res/ael/pval.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/res/ael/pval.c?view=diff&rev=168748&r1=168747&r2=168748
==============================================================================
--- branches/1.6.1/res/ael/pval.c (original)
+++ branches/1.6.1/res/ael/pval.c Thu Jan 15 18:47:29 2009
@@ -745,6 +745,7 @@
 				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);