From e39be48c922e2ffbfa76fc4c62141337b9b8adb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Wed, 26 Dec 2018 11:36:26 +0100 Subject: [PATCH] CTU: Refactoring, create ErrorPath in ctu --- lib/checknullpointer.cpp | 21 +++------ lib/checkuninitvar.cpp | 21 +++------ lib/ctu.cpp | 97 +++++++++++++++++++++++++++++++--------- lib/ctu.h | 10 ++--- 4 files changed, 93 insertions(+), 56 deletions(-) diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp index 280028763..8840db026 100644 --- a/lib/checknullpointer.cpp +++ b/lib/checknullpointer.cpp @@ -682,23 +682,14 @@ bool CheckNullPointer::analyseWholeProgram(const CTU::FileInfo *ctu, const std:: if (functionCall.argvalue != 0) continue; - if (!findPath(functionCall, unsafeUsage, nestedCallsMap)) + const std::list &locationList = + ctu->getErrorPath(functionCall, + unsafeUsage, + nestedCallsMap, + "Dereferencing argument ARG that is null"); + if (locationList.empty()) continue; - ErrorLogger::ErrorMessage::FileLocation fileLoc1; - fileLoc1.setfile(functionCall.location.fileName); - fileLoc1.line = functionCall.location.linenr; - fileLoc1.setinfo("Calling function " + functionCall.functionName + ", " + MathLib::toString(functionCall.argnr) + getOrdinalText(functionCall.argnr) + " argument is null"); - - ErrorLogger::ErrorMessage::FileLocation fileLoc2; - fileLoc2.setfile(unsafeUsage.location.fileName); - fileLoc2.line = unsafeUsage.location.linenr; - fileLoc2.setinfo("Dereferencing argument " + unsafeUsage.argumentName + " that is null"); - - std::list locationList; - locationList.push_back(fileLoc1); - locationList.push_back(fileLoc2); - const ErrorLogger::ErrorMessage errmsg(locationList, emptyString, Severity::error, diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index ec3cbd01d..b555810e9 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -1370,23 +1370,14 @@ bool CheckUninitVar::analyseWholeProgram(const CTU::FileInfo *ctu, const std::li if (functionCall.valueType != ValueFlow::Value::ValueType::UNINIT) continue; - if (!findPath(functionCall, unsafeUsage, nestedCallsMap)) + const std::list &locationList = + ctu->getErrorPath(functionCall, + unsafeUsage, + nestedCallsMap, + "Using argument ARG"); + if (locationList.empty()) continue; - ErrorLogger::ErrorMessage::FileLocation fileLoc1; - fileLoc1.setfile(functionCall.location.fileName); - fileLoc1.line = functionCall.location.linenr; - fileLoc1.setinfo("Calling function " + functionCall.functionName + ", variable " + functionCall.argumentExpression + " is uninitialized"); - - ErrorLogger::ErrorMessage::FileLocation fileLoc2; - fileLoc2.setfile(unsafeUsage.location.fileName); - fileLoc2.line = unsafeUsage.location.linenr; - fileLoc2.setinfo("Using argument " + unsafeUsage.argumentName); - - std::list locationList; - locationList.push_back(fileLoc1); - locationList.push_back(fileLoc2); - const ErrorLogger::ErrorMessage errmsg(locationList, emptyString, Severity::error, diff --git a/lib/ctu.cpp b/lib/ctu.cpp index c7e3e01de..33906a963 100644 --- a/lib/ctu.cpp +++ b/lib/ctu.cpp @@ -29,27 +29,6 @@ std::string CTU::getFunctionId(const Tokenizer *tokenizer, const Function *funct return tokenizer->list.file(function->tokenDef) + ':' + MathLib::toString(function->tokenDef->linenr()); } -bool CTU::findPath(const CTU::FileInfo::FunctionCall &from, - const CTU::FileInfo::UnsafeUsage &to, - const std::map> &nestedCalls) -{ - if (from.functionId == to.functionId && from.argnr == to.argnr) - return true; - - const std::map>::const_iterator nc = nestedCalls.find(from.functionId); - if (nc == nestedCalls.end()) - return false; - - for (std::list::const_iterator it = nc->second.begin(); it != nc->second.end(); ++it) { - if (from.functionId == it->id && from.argnr == it->argnr && it->id2 == to.functionId && it->argnr2 == to.argnr) - return true; - } - - return false; -} - - - CTU::FileInfo::Location::Location(const Tokenizer *tokenizer, const Token *tok) { fileName = tokenizer->list.file(tok); @@ -307,3 +286,79 @@ CTU::FileInfo *CTU::getFileInfo(const Tokenizer *tokenizer) return fileInfo; } + + +static bool findPath(const CTU::FileInfo::FunctionCall &from, + const CTU::FileInfo::UnsafeUsage &to, + const std::map> &nestedCalls) +{ + if (from.functionId == to.functionId && from.argnr == to.argnr) + return true; + + const std::map>::const_iterator nc = nestedCalls.find(from.functionId); + if (nc == nestedCalls.end()) + return false; + + for (const CTU::FileInfo::NestedCall &nestedCall : nc->second) { + if (from.functionId == nestedCall.id && from.argnr == nestedCall.argnr && nestedCall.id2 == to.functionId && nestedCall.argnr2 == to.argnr) + return true; + } + + return false; +} + +static std::string replacestr(std::string s, const std::string &from, const std::string &to) +{ + std::string::size_type pos1 = 0; + while (pos1 < s.size()) { + pos1 = s.find(from, pos1); + if (pos1 == std::string::npos) + return s; + if (pos1 > 0 && (s[pos1-1] == '_' || std::isalnum(s[pos1-1]))) { + pos1++; + continue; + } + const std::string::size_type pos2 = pos1 + from.size(); + if (pos2 >= s.size()) + return s.substr(0,pos1) + to; + if (s[pos2] == '_' || std::isalnum(s[pos2])) { + pos1++; + continue; + } + s = s.substr(0,pos1) + to + s.substr(pos2); + pos1 += to.size(); + } + return s; +} + +std::list CTU::FileInfo::getErrorPath(const CTU::FileInfo::FunctionCall &functionCall, + const CTU::FileInfo::UnsafeUsage &unsafeUsage, + const std::map> &nestedCallsMap, + const char info[]) const +{ + std::list locationList; + + if (!findPath(functionCall, unsafeUsage, nestedCallsMap)) + return locationList; + + std::string value1; + if (functionCall.valueType == ValueFlow::Value::ValueType::INT) + value1 = "null"; + else if (functionCall.valueType == ValueFlow::Value::ValueType::UNINIT) + value1 = "uninitialized"; + + ErrorLogger::ErrorMessage::FileLocation fileLoc1; + fileLoc1.setfile(functionCall.location.fileName); + fileLoc1.line = functionCall.location.linenr; + fileLoc1.setinfo("Calling function " + functionCall.functionName + ", " + MathLib::toString(functionCall.argnr) + getOrdinalText(functionCall.argnr) + " argument is " + value1); + + ErrorLogger::ErrorMessage::FileLocation fileLoc2; + fileLoc2.setfile(unsafeUsage.location.fileName); + fileLoc2.line = unsafeUsage.location.linenr; + fileLoc2.setinfo(replacestr(info, "ARG", unsafeUsage.argumentName)); + + locationList.push_back(fileLoc1); + locationList.push_back(fileLoc2); + + return locationList; +} diff --git a/lib/ctu.h b/lib/ctu.h index 9f61c1993..31d60dc10 100644 --- a/lib/ctu.h +++ b/lib/ctu.h @@ -90,6 +90,11 @@ namespace CTU { void loadFromXml(const tinyxml2::XMLElement *xmlElement); std::map> getNestedCallsMap() const; + + std::list getErrorPath(const FunctionCall &functionCall, + const UnsafeUsage &unsafeUsage, + const std::map> &nestedCallsMap, + const char info[]) const; }; std::string getFunctionId(const Tokenizer *tokenizer, const Function *function); @@ -98,11 +103,6 @@ namespace CTU { FileInfo *getFileInfo(const Tokenizer *tokenizer); std::list loadUnsafeUsageListFromXml(const tinyxml2::XMLElement *xmlElement); - - bool findPath(const FileInfo::FunctionCall &from, - const FileInfo::UnsafeUsage &to, - const std::map> &nestedCalls); - } /// @}