[asterisk-commits] tilghman: branch 1.6.2 r194431 - in /branches/1.6.2: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu May 14 11:23:16 2009
New Revision: 194431

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=194431
Log:
Merged revisions 194430 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r194430 | tilghman | 2009-05-14 11:22:14 -0500 (Thu, 14 May 2009) | 7 lines
  
  If the timing ended on a zero, then we would loop forever.
  (closes issue #14983)
   Reported by: teox
   Patches: 
         20090513__issue14983.diff.txt uploaded by tilghman (license 14)
   Tested by: teox
........

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

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

Modified: branches/1.6.2/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/pbx.c?view=diff&rev=194431&r1=194430&r2=194431
==============================================================================
--- branches/1.6.2/main/pbx.c (original)
+++ branches/1.6.2/main/pbx.c Thu May 14 11:23:16 2009
@@ -6775,11 +6775,10 @@
 		/* Fill the mask. Remember that ranges are cyclic */
 		mask |= (1 << end);   /* initialize with last element */
 		while (start != end) {
-			if (start >= max) {
+			mask |= (1 << start);
+			if (++start >= max) {
 				start = 0;
 			}
-			mask |= (1 << start);
-			start++;
 		}
 	}
 	return mask;