Fixed danmar#2912 (false positive: (portability) Assigning an integer (int/long/etc) to a pointer is not portable)

Daniel Marjam&auml;ki · Daniel Marjam&auml;ki · commit 35178cc16192 · 2011-07-16T17:08:03.000+02:00
diff --git a/lib/check64bit.cpp b/lib/check64bit.cpp
@@ -41,7 +41,7 @@ static bool isaddr(const Variable *var)
 /** Is given variable an integer variable */
 static bool isint(const Variable *var)
 {
-    return (var && Token::Match(var->nameToken()->previous(), "int|long|DWORD"));
+    return (var && Token::Match(var->nameToken()->previous(), "int|long|DWORD %var% !!["));
 }
 
 void Check64BitPortability::pointerassignment()
diff --git a/test/test64bit.cpp b/test/test64bit.cpp
@@ -86,6 +86,13 @@ class Test64BitPortability : public TestFixture
               "}\n");
         ASSERT_EQUALS("[test.cpp:3]: (portability) Assigning an address value to the integer (int/long/etc) type is not portable\n", errout.str());
 
+        check("int foo(int p[])\n"
+              "{\n"
+              "    int *a = p;\n"
+              "    return a;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
         check("void foo(int x)\n"
               "{\n"
               "    int *p = x;\n"

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static bool isaddr(const Variable *var)`
`41`	`41`	`/** Is given variable an integer variable */`
`42`	`42`	`static bool isint(const Variable *var)`
`43`	`43`	`{`
`44`		`- return (var && Token::Match(var->nameToken()->previous(), "int\|long\|DWORD"));`
	`44`	`+ return (var && Token::Match(var->nameToken()->previous(), "int\|long\|DWORD %var% !!["));`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`void Check64BitPortability::pointerassignment()`