[asterisk-commits] tilghman: branch 1.6.0 r173312 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Feb  3 18:45:32 2009
New Revision: 173312

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

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

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=173312&r1=173311&r2=173312
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Tue Feb  3 18:45:32 2009
@@ -1505,6 +1505,9 @@
 						*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++;
 				}