Fixed cppcheck-opensource#2892 (false positive: (portability) Assigning an address value to the integer (int/long/etc) type is not portable)

Daniel Marjamäki · Daniel Marjamäki · commit 66d145ba1c33 · 2011-07-07T15:14:33.000+02:00
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -61,7 +61,7 @@ void Check64BitPortability::pointerassignment()
             if (isaddr(var1) && isint(var2))
                 assignmentIntegerToAddressError(tok->next());
 
-            else if (isint(var1) && isaddr(var2))
+            else if (isint(var1) && isaddr(var2) && !tok->tokAt(3)->isPointerCompare())
                 assignmentAddressToIntegerError(tok->next());
         }
     }
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -36,6 +36,7 @@ Token::Token(Token **t) :
     _isBoolean(false),
     _isUnsigned(false),
     _isSigned(false),
+    _isPointerCompare(false),
     _isLong(false),
     _isUnused(false),
     _varId(0),
@@ -112,6 +113,7 @@ void Token::deleteThis()
         _isBoolean = _next->_isBoolean;
         _isUnsigned = _next->_isUnsigned;
         _isSigned = _next->_isSigned;
+        _isPointerCompare = _next->_isPointerCompare;
         _isLong = _next->_isLong;
         _isUnused = _next->_isUnused;
         _varId = _next->_varId;
diff --git a/lib/token.h b/lib/token.h
@@ -219,6 +219,14 @@ class Token
     {
         _isSigned = sign;
     }
+    bool isPointerCompare() const
+    {
+        return _isPointerCompare;
+    }
+    void isPointerCompare(bool b)
+    {
+        _isPointerCompare = b;
+    }
     bool isLong() const
     {
         return _isLong;
@@ -447,6 +455,7 @@ class Token
     bool _isBoolean;
     bool _isUnsigned;
     bool _isSigned;
+    bool _isPointerCompare;
     bool _isLong;
     bool _isUnused;
     unsigned int _varId;
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -260,6 +260,7 @@ void Tokenizer::insertTokens(Token *dest, const Token *src, unsigned int n)
         dest->isBoolean(src->isBoolean());
         dest->isUnsigned(src->isUnsigned());
         dest->isSigned(src->isSigned());
+        dest->isPointerCompare(src->isPointerCompare());
         dest->isLong(src->isLong());
         dest->isUnused(src->isUnused());
         src  = src->next();
@@ -284,6 +285,7 @@ Token *Tokenizer::copyTokens(Token *dest, const Token *first, const Token *last)
         tok2->isBoolean(tok->isBoolean());
         tok2->isUnsigned(tok->isUnsigned());
         tok2->isSigned(tok->isSigned());
+        tok2->isPointerCompare(tok->isPointerCompare());
         tok2->isLong(tok->isLong());
         tok2->isUnused(tok->isUnused());
         tok2->varId(tok->varId());
@@ -6477,17 +6479,21 @@ void Tokenizer::simplifyIfNotNull()
                 Token::Match(tok, "0 != %var%"))
             {
                 deleteFrom = tok->previous();
+                if (tok->tokAt(2))
+                    tok->tokAt(2)->isPointerCompare(true);
             }
 
             else if (Token::Match(tok, "%var% != 0"))
             {
                 deleteFrom = tok;
+                tok->isPointerCompare(true);
             }
 
             else if (Token::Match(tok, "%var% .|:: %var% != 0"))
             {
                 tok = tok->tokAt(2);
                 deleteFrom = tok;
+                tok->isPointerCompare(true);
             }
         }
 
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -38,6 +38,7 @@ class Test64BitPortability : public TestFixture
         TEST_CASE(novardecl);
         TEST_CASE(functionpar);
         TEST_CASE(structmember);
+        TEST_CASE(ptrcompare);
     }
 
     void check(const char code[])
@@ -101,6 +102,15 @@ class Test64BitPortability : public TestFixture
               "}\n");
         TODO_ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning an address value to the integer (int/long/etc) type is not portable\n", "", errout.str());
     }
+
+    void ptrcompare()
+    {
+        // Ticket #2892
+        check("void foo(int *p) {\n"
+              "    int a = (p != NULL);\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
 };
 
 REGISTER_TEST(Test64BitPortability)

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ void Check64BitPortability::pointerassignment()`
`61`	`61`	`if (isaddr(var1) && isint(var2))`
`62`	`62`	`assignmentIntegerToAddressError(tok->next());`
`63`	`63`
`64`		`- else if (isint(var1) && isaddr(var2))`
	`64`	`+ else if (isint(var1) && isaddr(var2) && !tok->tokAt(3)->isPointerCompare())`
`65`	`65`	`assignmentAddressToIntegerError(tok->next());`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,7 @@ void Tokenizer::insertTokens(Token dest, const Token src, unsigned int n)`
`260`	`260`	`dest->isBoolean(src->isBoolean());`
`261`	`261`	`dest->isUnsigned(src->isUnsigned());`
`262`	`262`	`dest->isSigned(src->isSigned());`
	`263`	`+ dest->isPointerCompare(src->isPointerCompare());`
`263`	`264`	`dest->isLong(src->isLong());`
`264`	`265`	`dest->isUnused(src->isUnused());`
`265`	`266`	`src = src->next();`
`@@ -284,6 +285,7 @@ Token Tokenizer::copyTokens(Token dest, const Token first, const Token last)`
`284`	`285`	`tok2->isBoolean(tok->isBoolean());`
`285`	`286`	`tok2->isUnsigned(tok->isUnsigned());`
`286`	`287`	`tok2->isSigned(tok->isSigned());`
	`288`	`+ tok2->isPointerCompare(tok->isPointerCompare());`
`287`	`289`	`tok2->isLong(tok->isLong());`
`288`	`290`	`tok2->isUnused(tok->isUnused());`
`289`	`291`	`tok2->varId(tok->varId());`
`@@ -6477,17 +6479,21 @@ void Tokenizer::simplifyIfNotNull()`
`6477`	`6479`	`Token::Match(tok, "0 != %var%"))`
`6478`	`6480`	`{`
`6479`	`6481`	`deleteFrom = tok->previous();`
	`6482`	`+ if (tok->tokAt(2))`
	`6483`	`+ tok->tokAt(2)->isPointerCompare(true);`
`6480`	`6484`	`}`
`6481`	`6485`
`6482`	`6486`	`else if (Token::Match(tok, "%var% != 0"))`
`6483`	`6487`	`{`
`6484`	`6488`	`deleteFrom = tok;`
	`6489`	`+ tok->isPointerCompare(true);`
`6485`	`6490`	`}`
`6486`	`6491`
`6487`	`6492`	`else if (Token::Match(tok, "%var% .\|:: %var% != 0"))`
`6488`	`6493`	`{`
`6489`	`6494`	`tok = tok->tokAt(2);`
`6490`	`6495`	`deleteFrom = tok;`
	`6496`	`+ tok->isPointerCompare(true);`
`6491`	`6497`	`}`
`6492`	`6498`	`}`
`6493`	`6499`