Update checkfunctions.cpp

Author: chrchr-github

lib/checkfunctions.cpp

@@ -102,10 +102,14 @@ void CheckFunctionsImpl::functionCalledError(const Token* tok, Severity severity
     reportError(tok, severity, prefix + "Called", msg, CWE477, Certainty::normal);
 }
 
-static bool hasMinSize(const Token* ftok, int argnr, const Settings& settings)
+static bool hasArgMinSize(const Token* ftok, int argnr, const Settings& settings)
 {
-    const std::vector<Library::ArgumentChecks::MinSize>* minsizes = settings.library.argminsizes(ftok, argnr);
-    return minsizes && !minsizes->empty();
+    if (const std::vector<Library::ArgumentChecks::MinSize>* minsizes = settings.library.argminsizes(ftok, argnr)) {
+        return std::any_of(minsizes->begin(), minsizes->end(), [](const Library::ArgumentChecks::MinSize& ms) {
+            return ms.type == Library::ArgumentChecks::MinSize::Type::ARGVALUE;
+        });
+    }
+    return false;
 }
 
 //---------------------------------------------------------------------------
@@ -143,7 +147,7 @@ void CheckFunctionsImpl::invalidFunctionUsage()
                         invalidFunctionArgError(argtok, functionToken->str(), argnr, nullptr, mSettings.library.validarg(functionToken, argnr));
                 }
                 // check <strz>
-                if (mSettings.library.isargstrz(functionToken, argnr) && !hasMinSize(functionToken, argnr, mSettings)) {
+                if (mSettings.library.isargstrz(functionToken, argnr) && !hasArgMinSize(functionToken, argnr, mSettings)) {
                     if (Token::Match(argtok, "& %var% !![") && argtok->next() && argtok->next()->valueType()) {
                         const ValueType * valueType = argtok->next()->valueType();
                         const Variable * variable = argtok->next()->variable();