aboutsummaryrefslogtreecommitdiffstats
path: root/main/ast_expr2.y
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-28 20:00:06 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-28 20:00:06 +0000
commit9c06967284bff994445c3e00946feed054b32b54 (patch)
treee013ba1a5a930fe5c4bdc326aca35b2533887cd9 /main/ast_expr2.y
parent0de1b41f0f77d6476bff711464ebdf1ce14ca820 (diff)
Merged revisions 293195-293196 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r293195 | tilghman | 2010-10-28 14:52:52 -0500 (Thu, 28 Oct 2010) | 12 lines Merged revisions 293194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) | 5 lines "!00" evaluated as false, which is incorrect. Fixing. Reported (though the reporter did not understand he was reporting a bug) on the asterisk-users list: http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html ........ ................ r293196 | tilghman | 2010-10-28 14:54:34 -0500 (Thu, 28 Oct 2010) | 12 lines Merged revisions 293194 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r293194 | tilghman | 2010-10-28 14:44:37 -0500 (Thu, 28 Oct 2010) | 5 lines "!00" evaluated as false, which is incorrect. Fixing. Reported (though the reporter did not understand he was reporting a bug) on the asterisk-users list: http://lists.digium.com/pipermail/asterisk-users/2010-October/255505.html ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@293197 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2.y')
-rw-r--r--main/ast_expr2.y4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index d963fba61..aabca8a46 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -1402,6 +1402,8 @@ op_compl (struct val *a)
v1 = 0;
else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' )
v1 = 0;
+ else
+ v1 = atoi(a->u.s);
}
break;
@@ -1414,6 +1416,8 @@ op_compl (struct val *a)
v1 = 0;
else if (strlen(a->u.s) == 1 && a->u.s[0] == '0' )
v1 = 0;
+ else
+ v1 = atoi(a->u.s);
}
break;
}