fixed #14638 - report errors for invalid suppression lines #8404
+93
−29
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -207,9 +207,8 @@ std::vector<SuppressionList::Suppression> SuppressionList::parseMultiSuppressCom | |
| return suppressions; | ||
| } | ||
|
|
||
| SuppressionList::Suppression SuppressionList::parseLine(std::string line) | ||
| { | ||
| SuppressionList::Suppression suppression; | ||
|
|
||
| // Strip any end of line comments | ||
|
|
@@ -218,13 +217,18 @@ SuppressionList::Suppression SuppressionList::parseLine(const std::string &line) | |
| while (endpos > 0 && std::isspace(line[endpos-1])) { | ||
| endpos--; | ||
| } | ||
| line.resize(endpos); | ||
| } | ||
|
|
||
| const auto parts = splitString(line, '\n'); | ||
| const std::string& suppr_l = parts[0]; | ||
|
|
||
| const std::string::size_type first_sep = suppr_l.find(':'); | ||
| suppression.errorId = suppr_l.substr(0, first_sep); | ||
| if (first_sep != std::string::npos) { | ||
| suppression.fileName = suppr_l.substr(first_sep+1); | ||
| if (!suppression.fileName.empty()) { | ||
| // TODO: this only works with files which have an extension | ||
| // If there is not a dot after the last colon in "file" then | ||
| // the colon is a separator and the contents after the colon | ||
| // is a line number.. | ||
|
|
@@ -234,39 +238,48 @@ SuppressionList::Suppression SuppressionList::parseLine(const std::string &line) | |
|
|
||
| // if a colon is found and there is no dot after it.. | ||
| if (pos != std::string::npos && | ||
| suppression.fileName.find('.', pos) == std::string::npos) | ||
| { | ||
| // parse out the line number | ||
| const std::string line_s = suppression.fileName.substr(pos+1); | ||
| suppression.fileName.erase(pos); | ||
|
|
||
| if (suppression.fileName.empty()) | ||
| throw std::runtime_error("filename is missing"); | ||
|
|
||
| try { | ||
| suppression.lineNumber = strToInt<int>(line_s); | ||
| } catch (const std::runtime_error& e) { | ||
| throw std::runtime_error(std::string("invalid line number (") + e.what() + ")"); | ||
| } | ||
| } | ||
| suppression.fileName = Path::simplifyPath(suppression.fileName); | ||
| } else { | ||
| throw std::runtime_error("filename is missing"); | ||
| } | ||
| } | ||
|
|
||
| // TODO: make this optional - do we even encounter this in production code? | ||
|
Collaborator
Author
There was a problem hiding this comment. Lines with newlines can/are not being supported via suppression files and the I will look further into this in a follow-up.
Collaborator
Author
There was a problem hiding this comment. They are used in the IPC data and could be used in
Collaborator
Author
There was a problem hiding this comment. The newlines were only recently introduced in #8169 which is a very unfortunate change. It would make more sense to preserve the previous |
||
| // when parsing string generated internally by toString() there can be newline | ||
| for (std::size_t i = 1; i < parts.size(); ++i) { | ||
| if (startsWith(parts[i], "symbol=")) | ||
| suppression.symbolName = parts[i].substr(7); | ||
| else if (parts[i] == "polyspace=1") | ||
| suppression.isPolyspace = true; | ||
| else | ||
| throw std::runtime_error("unexpected extra '" + parts[i] + "'"); | ||
| } | ||
|
|
||
| return suppression; | ||
| } | ||
|
|
||
| std::string SuppressionList::addSuppressionLine(const std::string &line) | ||
| { | ||
| try { | ||
| return addSuppression(parseLine(line)); | ||
| } catch (const std::exception& e) { | ||
| return e.what(); | ||
| } | ||
| } | ||
|
|
||
| std::string SuppressionList::addSuppression(SuppressionList::Suppression suppression) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The try-catch did nothing because the stream was not set to throw exceptions.