walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added '-' and '.' to allowed chars in error ids for suppressions. (#1338) 

Those chars are used for example in misra.py
This commit is contained in:
Konrad Grochowski 2018-08-17 08:20:39 +02:00 committed by Daniel Marjamäki
parent 78715d3eff
commit 0e70c8a916
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/suppressions.cpp
View File

@ -45,6 +45,18 @@ static bool isValidGlobPattern(const std::string &pattern)
return true; return true;
} }
static bool isAcceptedErrorIdChar(char c)
{
switch (c) {
case '_':
case '-':
case '.':
return true;
default:
return std::isalnum(c);
}
}
std::string Suppressions::parseFile(std::istream &istr) std::string Suppressions::parseFile(std::istream &istr)
{ {
// Change '\r' to '\n' in the istr // Change '\r' to '\n' in the istr
@ -155,7 +167,7 @@ std::string Suppressions::addSuppression(const Suppressions::Suppression &suppre
} }
if (suppression.errorId != "*") { if (suppression.errorId != "*") {
for (std::string::size_type pos = 0; pos < suppression.errorId.length(); ++pos) { for (std::string::size_type pos = 0; pos < suppression.errorId.length(); ++pos) {
if (suppression.errorId[pos] < 0 || (!std::isalnum(suppression.errorId[pos]) && suppression.errorId[pos] != '_')) { if (suppression.errorId[pos] < 0 || !isAcceptedErrorIdChar(suppression.errorId[pos])) {
return "Failed to add suppression. Invalid id \"" + suppression.errorId + "\""; return "Failed to add suppression. Invalid id \"" + suppression.errorId + "\"";
} }
if (pos == 0 && std::isdigit(suppression.errorId[pos])) { if (pos == 0 && std::isdigit(suppression.errorId[pos])) {