walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #153 from simartin/ticket_4930 

Fixed #4930 ((error) Internal Error: Division by zero)
This commit is contained in:
Daniel Marjamäki 2013-07-28 04:17:03 -07:00
parent 2a1af1acda eb3bf571be
commit 7fd12ee2b5
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/templatesimplifier.cpp
View File

@ -766,7 +766,7 @@ bool TemplateSimplifier::simplifyNumericCalculations(Token *tok)
while (tok->tokAt(4) && tok->next()->isNumber() && tok->tokAt(3)->isNumber()) { // %any% %num% %any% %num% %any% while (tok->tokAt(4) && tok->next()->isNumber() && tok->tokAt(3)->isNumber()) { // %any% %num% %any% %num% %any%
const Token* op = tok->tokAt(2); const Token* op = tok->tokAt(2);
const Token* after = tok->tokAt(4); const Token* after = tok->tokAt(4);
if (Token::Match(tok, "* %num% /") && tok->next()->str() == MathLib::multiply(tok->strAt(3), MathLib::divide(tok->next()->str(), tok->strAt(3)))) { if (Token::Match(tok, "* %num% /") && (tok->strAt(3) != "0") && tok->next()->str() == MathLib::multiply(tok->strAt(3), MathLib::divide(tok->next()->str(), tok->strAt(3)))) {
// Division where result is a whole number // Division where result is a whole number
} else if (!((op->str() == "*" && (isLowerThanMulDiv(tok) || tok->str() == "*") && isLowerEqualThanMulDiv(after)) || // associative } else if (!((op->str() == "*" && (isLowerThanMulDiv(tok) || tok->str() == "*") && isLowerEqualThanMulDiv(after)) || // associative
(Token::Match(op, "[/%]") && isLowerThanMulDiv(tok) && isLowerEqualThanMulDiv(after)) || // NOT associative (Token::Match(op, "[/%]") && isLowerThanMulDiv(tok) && isLowerEqualThanMulDiv(after)) || // NOT associative

10
test/testother.cpp
View File

@ -42,6 +42,7 @@ private:
TEST_CASE(zeroDiv4); TEST_CASE(zeroDiv4);
TEST_CASE(zeroDiv5); TEST_CASE(zeroDiv5);
TEST_CASE(zeroDiv6); TEST_CASE(zeroDiv6);
TEST_CASE(zeroDiv7); // #4930
TEST_CASE(nanInArithmeticExpression); TEST_CASE(nanInArithmeticExpression);
@ -414,6 +415,15 @@ private:
"} } }"); "} } }");
ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (error) Division by zero.\n", errout.str());
} }
void zeroDiv7() {
check("void f() {\n"
" int a = 1/2*3/0;\n"
" int b = 1/2*3%0;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (error) Division by zero.\n"
"[test.cpp:3]: (error) Division by zero.\n", errout.str());
}
void nanInArithmeticExpression() { void nanInArithmeticExpression() {
check("void f()\n" check("void f()\n"