tweak

Author: danmar

lib/checkother.cpp

@@ -408,15 +408,15 @@ void CheckOther::cstyleCastError(const Token *tok, bool isPtr)
                 "which kind of cast is expected.", CWE398, Certainty::normal);
 }
 
-void CheckOther::warningDangerousOldStyleTypeCast()
+void CheckOther::warningDangerousTypeCast()
 {
     // Only valid on C++ code
     if (!mTokenizer->isCPP())
         return;
     if (!mSettings->severity.isEnabled(Severity::warning) && !mSettings->isPremiumEnabled("cstyleCast"))
         return;
 
-    logChecker("CheckOther::warningDangerousOldStyleTypeCast"); // warning,c++
+    logChecker("CheckOther::warningDangerousTypeCast"); // warning,c++
 
     const SymbolDatabase *symbolDatabase = mTokenizer->getSymbolDatabase();
     for (const Scope * scope : symbolDatabase->functionScopes) {
@@ -440,7 +440,7 @@ void CheckOther::dangerousTypeCastError(const Token *tok, bool isPtr)
 {
     const std::string type = isPtr ? "pointer" : "reference";
     reportError(tok, Severity::warning, "dangerousTypeCast",
-                "Potentially dangerous C style type cast of " + type + " to object",
+                "Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast",
                 CWE398, Certainty::normal);
 }
 
@@ -460,15 +460,23 @@ void CheckOther::warningIntToPointerCast()
             continue;
         if (!tok->valueType() || tok->valueType()->pointer == 0)
             continue;
-        if (!MathLib::isIntHex(from->str()) && from->getKnownIntValue() != 0)
-            intToPointerCastError(tok);
+        if (!MathLib::isIntHex(from->str()) && from->getKnownIntValue() != 0) {
+            std::string format;
+            if (MathLib::isDec(from->str()))
+                format = "decimal";
+            else if (MathLib::isOct(from->str()))
+                format = "octal";
+            else
+                continue;
+            intToPointerCastError(tok, format);
+        }
     }
 }
 
-void CheckOther::intToPointerCastError(const Token *tok)
+void CheckOther::intToPointerCastError(const Token *tok, const std::string& format)
 {
     reportError(tok, Severity::portability, "intToPointerCast",
-                "Casting non-zero integer literal in decimal or octal format to pointer.",
+                "Casting non-zero " + format + " integer literal to pointer.",
                 CWE398, Certainty::normal);
 }
 
@@ -4498,6 +4506,7 @@ void CheckOther::runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger)
 
     // Checks
     checkOther.warningOldStylePointerCast();
+    checkOther.warningDangerousTypeCast();
     checkOther.warningIntToPointerCast();
     checkOther.suspiciousFloatingPointCast();
     checkOther.invalidPointerCast();
@@ -4566,7 +4575,7 @@ void CheckOther::getErrorMessages(ErrorLogger *errorLogger, const Settings *sett
     c.checkCastIntToCharAndBackError(nullptr, "func_name");
     c.cstyleCastError(nullptr);
     c.dangerousTypeCastError(nullptr, true);
-    c.intToPointerCastError(nullptr);
+    c.intToPointerCastError(nullptr, "decimal");
     c.suspiciousFloatingPointCastError(nullptr);
     c.passedByValueError(nullptr, false);
     c.constVariableError(nullptr, nullptr);

lib/checkother.h

@@ -81,7 +81,7 @@ class CPPCHECKLIB CheckOther : public Check {
     void warningOldStylePointerCast();
 
     /** @brief Dangerous type cast */
-    void warningDangerousOldStyleTypeCast();
+    void warningDangerousTypeCast();
 
     /** @brief Casting non-hexadecimal integer literal to pointer */
     void warningIntToPointerCast();
@@ -205,7 +205,7 @@ class CPPCHECKLIB CheckOther : public Check {
     void clarifyStatementError(const Token* tok);
     void cstyleCastError(const Token *tok, bool isPtr = true);
     void dangerousTypeCastError(const Token *tok, bool isPtr);
-    void intToPointerCastError(const Token *tok);
+    void intToPointerCastError(const Token *tok, const std::string& format);
     void suspiciousFloatingPointCastError(const Token *tok);
     void invalidPointerCastError(const Token* tok, const std::string& from, const std::string& to, bool inconclusive, bool toIsInt);
     void passedByValueError(const Variable* var, bool inconclusive, bool isRangeBasedFor = false);

man/checkers/dangerousTypeCast.md

@@ -1,7 +1,7 @@
 
 # dangerousTypeCast
 
-**Message**: Potentially dangerous C style type cast of pointer to object<br/>
+**Message**: Potentially invalid type conversion in old-style C cast, clarify/fix with C++ cast<br/>
 **Category**: Type Safety<br/>
 **Severity**: Warning<br/>
 **Language**: C++, not applicable for C code

test/testgarbage.cpp

@@ -1832,6 +1832,7 @@ class TestGarbage : public TestFixture {
         ASSERT_THROW_INTERNAL(checkCode("void f(){x=0,return return''[]()}"), SYNTAX);
         ASSERT_THROW_INTERNAL(checkCode("void f(){x='0'++'0'(return)[];}"), SYNTAX); // #9063
         (void)checkCode("void f(){*(int *)42=0;}"); // no syntax error
+        ignore_errout(); // we are not interested in the output
         ASSERT_THROW_INTERNAL(checkCode("void f() { x= 'x' > typedef name5 | ( , ;){ } (); }"), SYNTAX); // #9067
         ASSERT_THROW_INTERNAL(checkCode("void f() { x= {}( ) ( 'x')[ ] (); }"), SYNTAX); // #9068
         ASSERT_THROW_INTERNAL(checkCode("void f() { x= y{ } name5 y[ ] + y ^ name5 ^ name5 for ( ( y y y && y y y && name5 ++ int )); }"), SYNTAX); // #9069