From: Leif Madsen Date: Mon, 13 Jun 2011 19:51:52 +0000 (+0000) Subject: Avoid dividing by zero with L() option to Dial() X-Git-Tag: 1.8.5-rc1~11^2~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3c4818a51bb0b7b1ee8b2ed83e179e7d06a1811;p=thirdparty%2Fasterisk.git 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/branches/1.8@323213 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/channel.c b/main/channel.c index 5cdc3c9452..2c61d86ce3 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7175,7 +7175,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',