Merged revisions 323213 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323213 | lmadsen | 2011-06-13 15:51:52 -0400 (Mon, 13 Jun 2011) | 6 lines

  Avoid dividing by zero with L() option to Dial()

  Reported by: nicolasom
  Patches:

  issue-17995.patch - nicolasom (License #5994)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323214 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 9c9d6ca5ae662a3d554495b7243b2b841dcf1175..47ebe9b8078bdf89e1d93a23fdae0a05e2ff9ef7 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -7387,7 +7387,7 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
                config->nexteventts = ast_tvadd(config->start_time, ast_samp2tv(config->timelimit, 1000));
                if ((caller_warning || callee_warning) && config->play_warning) {
                        long next_warn = config->play_warning;
-                       if (time_left_ms < config->play_warning) {
+                       if (time_left_ms < config->play_warning && config->warning_freq > 0) {
                                /* At least one warning was played, which means we are returning after feature */
                                long warns_passed = (config->play_warning - time_left_ms) / config->warning_freq;
                                /* It is 'warns_passed * warning_freq' NOT '(warns_passed + 1) * warning_freq',