Fix cppcheck-opensource#1385 (False positive: unsigned division)

aggro80 · aggro80 · commit b52fa9451f58 · 2010-02-12T22:24:06.000+02:00
http://sourceforge.net/apps/trac/cppcheck/ticket/1385 This also fixes a bug in setVarId(). "unsigned int a" didn't get varid, untill later when unsigned was simplified away.
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -323,7 +323,10 @@ void CheckOther::checkUnsignedDivision()
         else if (Token::Match(tok, "[{};(,] unsigned %type% %var% [;=,)]"))
             varsign[tok->tokAt(3)->varId()] = 'u';
 
-        else if (!Token::Match(tok, "[).]") && Token::Match(tok->next(), "%var% / %var%"))
+        else if (!Token::Match(tok, "[).]") &&
+                 Token::Match(tok->next(), "%var% / %var%") &&
+                 tok->tokAt(1)->varId() != 0 &&
+                 tok->tokAt(3)->varId() != 0)
         {
             if (ErrorLogger::udivWarning(*_settings))
             {
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -1830,9 +1830,12 @@ void Tokenizer::setVarId()
         if (Token::Match(tok, "[,;{}(] %type%"))
             tok = tok->next();
 
-        if (tok->str() == "new" || tok->str() == "unsigned")
+        if (tok->str() == "new")
             continue;
 
+        if (tok->str() == "unsigned")
+            tok = tok->next();
+
         if (Token::Match(tok, "class|struct %type% :|{|;"))
             continue;
 
diff --git a/test/testdivision.cpp b/test/testdivision.cpp
@@ -115,6 +115,17 @@ class TestDivision : public TestFixture
               "    result = i2 / i1;}\n"
              );
         ASSERT_EQUALS("", errout.str());
+
+        check("void f1()\n"
+              "{\n"
+              "    unsigned int num = 0;\n"
+              "}\n"
+              "\n"
+              "void f2(int X)\n"
+              "{\n"
+              "    X = X / z;}\n"
+             );
+        ASSERT_EQUALS("", errout.str());
     }
 
     void division5()

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,10 @@ void CheckOther::checkUnsignedDivision()`
`323`	`323`	`else if (Token::Match(tok, "[{};(,] unsigned %type% %var% [;=,)]"))`
`324`	`324`	`varsign[tok->tokAt(3)->varId()] = 'u';`
`325`	`325`
`326`		`- else if (!Token::Match(tok, "[).]") && Token::Match(tok->next(), "%var% / %var%"))`
	`326`	`+ else if (!Token::Match(tok, "[).]") &&`
	`327`	`+ Token::Match(tok->next(), "%var% / %var%") &&`
	`328`	`+ tok->tokAt(1)->varId() != 0 &&`
	`329`	`+ tok->tokAt(3)->varId() != 0)`
`327`	`330`	`{`
`328`	`331`	`if (ErrorLogger::udivWarning(*_settings))`
`329`	`332`	`{`