avoid most unchecked dereferences of Settings

danmar · Jan 13, 2024 · 6a6bcd3 · 6a6bcd3
1 parent d015007
commit 6a6bcd3
Show file tree

Hide file tree

Showing 48 changed files with 390 additions and 390 deletions.
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -303,6 +303,9 @@ Library::Container::Yield astFunctionYield(const Token* tok, const Settings* set
     if (!tok)
         return Library::Container::Yield::NO_YIELD;
 
+    if (!settings)
+        return Library::Container::Yield::NO_YIELD;
+
     const auto* function = settings->library.getFunction(tok);
     if (!function)
         return Library::Container::Yield::NO_YIELD;

diff --git a/lib/check64bit.h b/lib/check64bit.h
@@ -54,7 +54,7 @@ class CPPCHECKLIB Check64BitPortability : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        Check64BitPortability check64BitPortability(&tokenizer, tokenizer.getSettings(), errorLogger);
+        Check64BitPortability check64BitPortability(&tokenizer, &tokenizer.getSettings(), errorLogger);
         check64BitPortability.pointerassignment();
     }
 

diff --git a/lib/checkassert.h b/lib/checkassert.h
@@ -50,7 +50,7 @@ class CPPCHECKLIB CheckAssert : public Check {
 
     /** run checks, the token list is not simplified */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckAssert checkAssert(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckAssert checkAssert(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkAssert.assertWithSideEffects();
     }
 

diff --git a/lib/checkautovariables.cpp b/lib/checkautovariables.cpp
@@ -607,7 +607,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     if (escape) {
                         if (getPointerDepth(tok) < getPointerDepth(tokvalue))
                             continue;
-                        if (!ValueFlow::isLifetimeBorrowed(tok, mSettings))
+                        if (!ValueFlow::isLifetimeBorrowed(tok, *mSettings))
                             continue;
                         if (tokvalue->exprId() == tok->exprId() && !(tok->variable() && tok->variable()->isArray()) &&
                             !astIsContainerView(tok->astParent()))
@@ -640,7 +640,7 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                     } else if (tok->variable() && tok->variable()->declarationId() == tok->varId()) {
                         var = tok->variable();
                     }
-                    if (!ValueFlow::isLifetimeBorrowed(tok, mSettings))
+                    if (!ValueFlow::isLifetimeBorrowed(tok, *mSettings))
                         continue;
                     const Token* nextTok = nextAfterAstRightmostLeaf(tok->astTop());
                     if (!nextTok)

diff --git a/lib/checkautovariables.h b/lib/checkautovariables.h
@@ -56,7 +56,7 @@ class CPPCHECKLIB CheckAutoVariables : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckAutoVariables checkAutoVariables(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckAutoVariables checkAutoVariables(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkAutoVariables.assignFunctionArg();
         checkAutoVariables.checkVarLifetime();
         checkAutoVariables.autoVariables();

diff --git a/lib/checkbool.h b/lib/checkbool.h
@@ -50,7 +50,7 @@ class CPPCHECKLIB CheckBool : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckBool checkBool(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckBool checkBool(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkBool.checkComparisonOfBoolExpressionWithInt();

diff --git a/lib/checkboost.h b/lib/checkboost.h
@@ -52,7 +52,7 @@ class CPPCHECKLIB CheckBoost : public Check {
         if (!tokenizer.isCPP())
             return;
 
-        CheckBoost checkBoost(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckBoost checkBoost(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkBoost.checkBoostForeachModification();
     }
 

diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -204,7 +204,7 @@ static bool getDimensionsEtc(const Token * const arrayToken, const Settings *set
                 return ChildrenToVisit::op1_and_op2;
             });
         }
-    } else if (const Token *stringLiteral = array->getValueTokenMinStrSize(settings, &path)) {
+    } else if (const Token *stringLiteral = array->getValueTokenMinStrSize(*settings, &path)) {
         Dimension dim;
         dim.tok = nullptr;
         dim.num = Token::getStrArraySize(stringLiteral);

diff --git a/lib/checkbufferoverrun.h b/lib/checkbufferoverrun.h
@@ -67,7 +67,7 @@ class CPPCHECKLIB CheckBufferOverrun : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckBufferOverrun checkBufferOverrun(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckBufferOverrun checkBufferOverrun(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkBufferOverrun.arrayIndex();
         checkBufferOverrun.pointerArithmetic();
         checkBufferOverrun.bufferOverflow();

diff --git a/lib/checkclass.h b/lib/checkclass.h
@@ -70,7 +70,7 @@ class CPPCHECKLIB CheckClass : public Check {
         if (tokenizer.isC())
             return;
 
-        CheckClass checkClass(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckClass checkClass(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         // can't be a simplified check .. the 'sizeof' is used.
         checkClass.checkMemset();

diff --git a/lib/checkcondition.h b/lib/checkcondition.h
@@ -58,7 +58,7 @@ class CPPCHECKLIB CheckCondition : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckCondition checkCondition(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckCondition checkCondition(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkCondition.multiCondition();
         checkCondition.clarifyCondition();   // not simplified because ifAssign
         checkCondition.multiCondition2();

diff --git a/lib/checkexceptionsafety.h b/lib/checkexceptionsafety.h
@@ -58,7 +58,7 @@ class CPPCHECKLIB CheckExceptionSafety : public Check {
         if (tokenizer.isC())
             return;
 
-        CheckExceptionSafety checkExceptionSafety(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckExceptionSafety checkExceptionSafety(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkExceptionSafety.destructors();
         checkExceptionSafety.deallocThrow();
         checkExceptionSafety.checkRethrowCopy();

diff --git a/lib/checkfunctions.cpp b/lib/checkfunctions.cpp
@@ -178,7 +178,7 @@ void CheckFunctions::invalidFunctionUsage()
                                 invalidFunctionArgStrError(argtok, functionToken->str(), argnr);
                             }
                         } else if (count > -1 && Token::Match(varTok, "= %str%")) {
-                            const Token* strTok = varTok->getValueTokenMinStrSize(mSettings);
+                            const Token* strTok = varTok->getValueTokenMinStrSize(*mSettings);
                             if (strTok) {
                                 const int strSize = Token::getStrArraySize(strTok);
                                 if (strSize > count && strTok->str().find('\0') == std::string::npos)

diff --git a/lib/checkfunctions.h b/lib/checkfunctions.h
@@ -60,7 +60,7 @@ class CPPCHECKLIB CheckFunctions : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckFunctions checkFunctions(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckFunctions checkFunctions(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         checkFunctions.checkIgnoredReturnValue();
         checkFunctions.checkMissingReturn();  // Missing "return" in exit path

diff --git a/lib/checkinternal.h b/lib/checkinternal.h
@@ -49,10 +49,10 @@ class CPPCHECKLIB CheckInternal : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        if (!tokenizer.getSettings()->checks.isEnabled(Checks::internalCheck))
+        if (!tokenizer.getSettings().checks.isEnabled(Checks::internalCheck))
             return;
 
-        CheckInternal checkInternal(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckInternal checkInternal(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         checkInternal.checkTokenMatchPatterns();
         checkInternal.checkTokenSimpleMatchPatterns();

diff --git a/lib/checkio.h b/lib/checkio.h
@@ -53,7 +53,7 @@ class CPPCHECKLIB CheckIO : public Check {
 
     /** @brief Run checks on the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckIO checkIO(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckIO checkIO(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         checkIO.checkWrongPrintfScanfArguments();
         checkIO.checkCoutCerrMisusage();

diff --git a/lib/checkleakautovar.h b/lib/checkleakautovar.h
@@ -117,7 +117,7 @@ class CPPCHECKLIB CheckLeakAutoVar : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckLeakAutoVar checkLeakAutoVar(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckLeakAutoVar checkLeakAutoVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkLeakAutoVar.check();
     }
 

diff --git a/lib/checkmemoryleak.h b/lib/checkmemoryleak.h
@@ -177,7 +177,7 @@ class CPPCHECKLIB CheckMemoryLeakInFunction : public Check, public CheckMemoryLe
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckMemoryLeakInFunction checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.checkReallocUsage();
     }
 
@@ -234,7 +234,7 @@ class CPPCHECKLIB CheckMemoryLeakInClass : public Check, private CheckMemoryLeak
         if (!tokenizer.isCPP())
             return;
 
-        CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckMemoryLeakInClass checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.check();
     }
 
@@ -278,7 +278,7 @@ class CPPCHECKLIB CheckMemoryLeakStructMember : public Check, private CheckMemor
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakStructMember checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckMemoryLeakStructMember checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.check();
     }
 
@@ -315,7 +315,7 @@ class CPPCHECKLIB CheckMemoryLeakNoVar : public Check, private CheckMemoryLeak {
         : Check(myName(), tokenizer, settings, errorLogger), CheckMemoryLeak(tokenizer, errorLogger, settings) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckMemoryLeakNoVar checkMemoryLeak(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckMemoryLeakNoVar checkMemoryLeak(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkMemoryLeak.check();
     }
 

diff --git a/lib/checknullpointer.h b/lib/checknullpointer.h
@@ -86,7 +86,7 @@ class CPPCHECKLIB CheckNullPointer : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckNullPointer checkNullPointer(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckNullPointer checkNullPointer(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkNullPointer.nullPointer();
         checkNullPointer.arithmetic();
         checkNullPointer.nullConstantDereference();

diff --git a/lib/checkother.h b/lib/checkother.h
@@ -69,7 +69,7 @@ class CPPCHECKLIB CheckOther : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckOther checkOther(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckOther checkOther(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkOther.warningOldStylePointerCast();

diff --git a/lib/checkpostfixoperator.h b/lib/checkpostfixoperator.h
@@ -55,7 +55,7 @@ class CPPCHECKLIB CheckPostfixOperator : public Check {
         if (tokenizer.isC())
             return;
 
-        CheckPostfixOperator checkPostfixOperator(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckPostfixOperator checkPostfixOperator(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkPostfixOperator.postfixOperator();
     }
 

diff --git a/lib/checksizeof.h b/lib/checksizeof.h
@@ -50,7 +50,7 @@ class CPPCHECKLIB CheckSizeof : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer& tokenizer, ErrorLogger* errorLogger) override {
-        CheckSizeof checkSizeof(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckSizeof checkSizeof(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkSizeof.sizeofsizeof();

diff --git a/lib/checkstl.h b/lib/checkstl.h
@@ -58,7 +58,7 @@ class CPPCHECKLIB CheckStl : public Check {
             return;
         }
 
-        CheckStl checkStl(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckStl checkStl(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkStl.erase();
         checkStl.if_find();
         checkStl.checkFindInsert();

diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
@@ -60,7 +60,7 @@ void CheckString::stringLiteralWrite()
         for (const Token* tok = scope->bodyStart->next(); tok != scope->bodyEnd; tok = tok->next()) {
             if (!tok->variable() || !tok->variable()->isPointer())
                 continue;
-            const Token *str = tok->getValueTokenMinStrSize(mSettings);
+            const Token *str = tok->getValueTokenMinStrSize(*mSettings);
             if (!str)
                 continue;
             if (Token::Match(tok, "%var% [") && Token::simpleMatch(tok->linkAt(1), "] ="))

diff --git a/lib/checkstring.h b/lib/checkstring.h
@@ -50,7 +50,7 @@ class CPPCHECKLIB CheckString : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckString checkString(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckString checkString(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         // Checks
         checkString.strPlusChar();

diff --git a/lib/checktype.cpp b/lib/checktype.cpp
@@ -299,7 +299,7 @@ void CheckType::signConversionError(const Token *tok, const ValueFlow::Value *ne
 //---------------------------------------------------------------------------
 // Checking for long cast of int result   const long x = var1 * var2;
 //---------------------------------------------------------------------------
-static bool checkTypeCombination(const ValueType& src, const ValueType& tgt, const Settings* settings)
+static bool checkTypeCombination(const ValueType& src, const ValueType& tgt, const Settings& settings)
 {
     static const std::pair<ValueType::Type, ValueType::Type> typeCombinations[] = {
         { ValueType::Type::INT, ValueType::Type::LONG },
@@ -343,7 +343,7 @@ void CheckType::checkLongCast()
 
         if (!lhstype || !rhstype)
             continue;
-        if (!checkTypeCombination(*rhstype, *lhstype, mSettings))
+        if (!checkTypeCombination(*rhstype, *lhstype, *mSettings))
             continue;
 
         // assign int result to long/longlong const nonpointer?
@@ -370,7 +370,7 @@ void CheckType::checkLongCast()
             if (tok->str() == "return") {
                 if (Token::Match(tok->astOperand1(), "<<|*")) {
                     const ValueType *type = tok->astOperand1()->valueType();
-                    if (type && checkTypeCombination(*type, *retVt, mSettings) &&
+                    if (type && checkTypeCombination(*type, *retVt, *mSettings) &&
                         type->pointer == 0U &&
                         type->originalTypeName.empty())
                         ret = tok;

diff --git a/lib/checktype.h b/lib/checktype.h
@@ -54,7 +54,7 @@ class CPPCHECKLIB CheckType : public Check {
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
         // These are not "simplified" because casts can't be ignored
-        CheckType checkType(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckType checkType(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkType.checkTooBigBitwiseShift();
         checkType.checkIntegerOverflow();
         checkType.checkSignConversion();

diff --git a/lib/checkuninitvar.h b/lib/checkuninitvar.h
@@ -81,7 +81,7 @@ class CPPCHECKLIB CheckUninitVar : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckUninitVar checkUninitVar(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckUninitVar checkUninitVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
         checkUninitVar.valueFlowUninit();
         checkUninitVar.check();
     }

diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h
@@ -58,7 +58,7 @@ class CPPCHECKLIB CheckUnusedVar : public Check {
 
     /** @brief Run checks against the normal token list */
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckUnusedVar checkUnusedVar(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckUnusedVar checkUnusedVar(&tokenizer, &tokenizer.getSettings(), errorLogger);
 
         // Coding style checks
         checkUnusedVar.checkStructMemberUsage();

diff --git a/lib/checkvaarg.h b/lib/checkvaarg.h
@@ -48,7 +48,7 @@ class CPPCHECKLIB CheckVaarg : public Check {
         : Check(myName(), tokenizer, settings, errorLogger) {}
 
     void runChecks(const Tokenizer &tokenizer, ErrorLogger *errorLogger) override {
-        CheckVaarg check(&tokenizer, tokenizer.getSettings(), errorLogger);
+        CheckVaarg check(&tokenizer, &tokenizer.getSettings(), errorLogger);
         check.va_start_argument();
         check.va_list_usage();
     }

diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -1525,7 +1525,7 @@ static void setTypes(TokenList &tokenList)
 
 static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDatabase)
 {
-    const Settings * const settings = tokenizer.getSettings();
+    const Settings & settings = tokenizer.getSettings();
 
     for (const Scope& scope : symbolDatabase->scopeList) {
         if (!scope.definedType)
@@ -1537,15 +1537,15 @@ static void setValues(const Tokenizer &tokenizer, const SymbolDatabase *symbolDa
                 return v * dim.num;
             });
             if (var.valueType())
-                typeSize += mul * var.valueType()->typeSize(settings->platform, true);
+                typeSize += mul * var.valueType()->typeSize(settings.platform, true);
         }
         scope.definedType->sizeOf = typeSize;
     }
 
     for (auto *tok = const_cast<Token*>(tokenizer.tokens()); tok; tok = tok->next()) {
         if (Token::simpleMatch(tok, "sizeof (")) {
-            ValueType vt = ValueType::parseDecl(tok->tokAt(2), *settings);
-            const int sz = vt.typeSize(settings->platform, true);
+            ValueType vt = ValueType::parseDecl(tok->tokAt(2), settings);
+            const int sz = vt.typeSize(settings.platform, true);
             if (sz <= 0)
                 continue;
             long long mul = 1;
@@ -1574,7 +1574,7 @@ void clangimport::parseClangAstDump(Tokenizer &tokenizer, std::istream &f)
     symbolDatabase->scopeList.back().check = symbolDatabase;
 
     clangimport::Data data;
-    data.mSettings = tokenizer.getSettings();
+    data.mSettings = &tokenizer.getSettings();
     data.mSymbolDatabase = symbolDatabase;
     std::string line;
     std::vector<AstNodePtr> tree;