From: Russell Bryant Date: Mon, 25 Dec 2006 05:22:40 +0000 (+0000) Subject: Merged revisions 48956 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3640 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b93f1f3e3779001d2affc483c7a357c678d9211b;p=thirdparty%2Fasterisk.git Merged revisions 48956 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r48956 | russell | 2006-12-25 00:21:20 -0500 (Mon, 25 Dec 2006) | 14 lines Merged revisions 48955 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r48955 | russell | 2006-12-25 00:19:48 -0500 (Mon, 25 Dec 2006) | 6 lines Fix an error introduced by copying and pasting the handling of the >= operator for the MATH function. If a single equal sign was used as an operator, the function would treat it is as if it were the >= operator. Now, it properly handles it as an invalid operator. (issue #8665, patch by tempest1) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48957 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/funcs/func_math.c b/funcs/func_math.c index 608135c53a..386897dbd8 100644 --- a/funcs/func_math.c +++ b/funcs/func_math.c @@ -120,7 +120,6 @@ static int math(struct ast_channel *chan, char *cmd, char *parse, iaction = LTEFUNCTION; } } else if ((op = strchr(mvalue1, '='))) { - iaction = GTFUNCTION; *op = '\0'; if (*(op + 1) == '=') { *++op = '\0';