Fix cppcheck-opensource#810 (false positive: Division with signed and unsigned operators)

aggro80 · aggro80 · commit 1401e3f668f9 · 2009-10-11T17:52:35.000+03:00
http://sourceforge.net/apps/trac/cppcheck/ticket/810
diff --git a/src/checkother.cpp b/src/checkother.cpp
@@ -308,27 +308,25 @@ void CheckOther::checkUnsignedDivision()
         return;
 
     // Check for "ivar / uvar" and "uvar / ivar"
-    std::map<std::string, char> varsign;
+    std::map<unsigned int, char> varsign;
     for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
     {
         if (Token::Match(tok, "[{};(,] %type% %var% [;=,)]"))
         {
             const char *type = tok->strAt(1);
             if (strcmp(type, "char") == 0 || strcmp(type, "short") == 0 || strcmp(type, "int") == 0)
-                varsign[tok->strAt(2)] = 's';
+                varsign[tok->tokAt(2)->varId()] = 's';
         }
 
         else if (Token::Match(tok, "[{};(,] unsigned %type% %var% [;=,)]"))
-            varsign[tok->strAt(3)] = 'u';
+            varsign[tok->tokAt(3)->varId()] = 'u';
 
         else if (!Token::Match(tok, "[).]") && Token::Match(tok->next(), "%var% / %var%"))
         {
             if (ErrorLogger::udivWarning(*_settings))
             {
-                const char *varname1 = tok->strAt(1);
-                const char *varname2 = tok->strAt(3);
-                char sign1 = varsign[varname1];
-                char sign2 = varsign[varname2];
+                char sign1 = varsign[tok->tokAt(1)->varId()];
+                char sign2 = varsign[tok->tokAt(3)->varId()];
 
                 if (sign1 && sign2 && sign1 != sign2)
                 {
@@ -342,8 +340,7 @@ void CheckOther::checkUnsignedDivision()
         {
             if (tok->strAt(3)[0] == '-' && ErrorLogger::udivError())
             {
-                const char *varname1 = tok->strAt(1);
-                char sign1 = varsign[varname1];
+                char sign1 = varsign[tok->tokAt(1)->varId()];
                 if (sign1 == 'u')
                 {
                     udivError(tok->next());
@@ -355,8 +352,7 @@ void CheckOther::checkUnsignedDivision()
         {
             if (tok->strAt(1)[0] == '-' && ErrorLogger::udivError())
             {
-                const char *varname2 = tok->strAt(3);
-                char sign2 = varsign[varname2];
+                char sign2 = varsign[tok->tokAt(3)->varId()];
                 if (sign2 == 'u')
                 {
                     udivError(tok->next());
diff --git a/test/testdivision.cpp b/test/testdivision.cpp
@@ -179,6 +179,14 @@ class TestDivision : public TestFixture
               "    }\n"
               "}\n", true, true);
         ASSERT_EQUALS("[test.cpp:6]: (possible style) Division with signed and unsigned operators\n", errout.str());
+
+        check("void a(int i) { }\n"
+              "int foo( unsigned int sz )\n"
+              "{\n"
+              "    register unsigned int i=1;\n"
+              "    return i/sz;\n"
+              "}\n", true, true);
+        ASSERT_EQUALS("", errout.str());
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -308,27 +308,25 @@ void CheckOther::checkUnsignedDivision()`
`308`	`308`	`return;`
`309`	`309`
`310`	`310`	`// Check for "ivar / uvar" and "uvar / ivar"`
`311`		`- std::map<std::string, char> varsign;`
	`311`	`+ std::map<unsigned int, char> varsign;`
`312`	`312`	`for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())`
`313`	`313`	`{`
`314`	`314`	`if (Token::Match(tok, "[{};(,] %type% %var% [;=,)]"))`
`315`	`315`	`{`
`316`	`316`	`const char *type = tok->strAt(1);`
`317`	`317`	`if (strcmp(type, "char") == 0 \|\| strcmp(type, "short") == 0 \|\| strcmp(type, "int") == 0)`
`318`		`- varsign[tok->strAt(2)] = 's';`
	`318`	`+ varsign[tok->tokAt(2)->varId()] = 's';`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`else if (Token::Match(tok, "[{};(,] unsigned %type% %var% [;=,)]"))`
`322`		`- varsign[tok->strAt(3)] = 'u';`
	`322`	`+ varsign[tok->tokAt(3)->varId()] = 'u';`
`323`	`323`
`324`	`324`	`else if (!Token::Match(tok, "[).]") && Token::Match(tok->next(), "%var% / %var%"))`
`325`	`325`	`{`
`326`	`326`	`if (ErrorLogger::udivWarning(*_settings))`
`327`	`327`	`{`
`328`		`- const char *varname1 = tok->strAt(1);`
`329`		`- const char *varname2 = tok->strAt(3);`
`330`		`- char sign1 = varsign[varname1];`
`331`		`- char sign2 = varsign[varname2];`
	`328`	`+ char sign1 = varsign[tok->tokAt(1)->varId()];`
	`329`	`+ char sign2 = varsign[tok->tokAt(3)->varId()];`
`332`	`330`
`333`	`331`	`if (sign1 && sign2 && sign1 != sign2)`
`334`	`332`	`{`
`@@ -342,8 +340,7 @@ void CheckOther::checkUnsignedDivision()`
`342`	`340`	`{`
`343`	`341`	`if (tok->strAt(3)[0] == '-' && ErrorLogger::udivError())`
`344`	`342`	`{`
`345`		`- const char *varname1 = tok->strAt(1);`
`346`		`- char sign1 = varsign[varname1];`
	`343`	`+ char sign1 = varsign[tok->tokAt(1)->varId()];`
`347`	`344`	`if (sign1 == 'u')`
`348`	`345`	`{`
`349`	`346`	`udivError(tok->next());`
`@@ -355,8 +352,7 @@ void CheckOther::checkUnsignedDivision()`
`355`	`352`	`{`
`356`	`353`	`if (tok->strAt(1)[0] == '-' && ErrorLogger::udivError())`
`357`	`354`	`{`
`358`		`- const char *varname2 = tok->strAt(3);`
`359`		`- char sign2 = varsign[varname2];`
	`355`	`+ char sign2 = varsign[tok->tokAt(3)->varId()];`
`360`	`356`	`if (sign2 == 'u')`
`361`	`357`	`{`
`362`	`358`	`udivError(tok->next());`