Fix

Author: web-flow

lib/check64bit.cpp

@@ -42,8 +42,10 @@ namespace {
 
 static bool is32BitIntegerReturn(const Function* func, const Settings* settings)
 {
+    if (settings->platform.sizeof_pointer != 8)
+        return false;
     const ValueType* vt = func->arg->valueType();
-    return vt && vt->isIntegral() && vt->typeSize(settings->platform) < settings->platform.sizeof_pointer;
+    return vt && vt->isIntegral() && vt->typeSize(settings->platform) == 4;
 }
 
 void Check64BitPortability::pointerassignment()

test/test64bit.cpp

@@ -319,6 +319,11 @@ class Test64BitPortability : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:2:5]: (portability) Returning an address value in a function with integer return type is not portable. [CastAddressToIntegerAtReturn]\n",
                       errout_str());
+
+        check("bool f(const int* p) {\n"
+              "    return p;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 };