diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-14 16:23:16 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-14 16:23:16 +0000 |
commit | 8b223a84052d88d0422d6e36789ea13b878a4b1d (patch) | |
tree | eb509295eedcc529e058b176e4d74d3cee448e9c /main | |
parent | 7bcb251a39ad15df12e8a711bea58368ebd42a2d (diff) |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@194431 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/pbx.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/pbx.c b/main/pbx.c index a26bad92f..534dc4c0b 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6775,11 +6775,10 @@ static unsigned get_range(char *src, int max, char *const names[], const char *m /* 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; |