diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-21 05:55:53 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-21 05:55:53 +0000 |
commit | 4da3bbce9535275db0cb05c7044cf397ae62ee60 (patch) | |
tree | ca64ea689bec538f293f2b730a68ce69626d41de /funcs | |
parent | c9053817a812656689a0d4c3838decfc17f0b6a1 (diff) |
Merged revisions 241766 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r241766 | tilghman | 2010-01-20 23:54:30 -0600 (Wed, 20 Jan 2010) | 9 lines
Merged revisions 241765 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r241765 | tilghman | 2010-01-20 23:53:17 -0600 (Wed, 20 Jan 2010) | 2 lines
Guard against division by zero.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@241767 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
-rw-r--r-- | funcs/func_math.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/funcs/func_math.c b/funcs/func_math.c index 663cc5daf..d4d0cb1dc 100644 --- a/funcs/func_math.c +++ b/funcs/func_math.c @@ -224,7 +224,11 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse, int inum1 = fnum1; int inum2 = fnum2; - ftmp = (inum1 % inum2); + if (inum2 == 0) { + ftmp = 0; + } else { + ftmp = (inum1 % inum2); + } break; } |