6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

[asan] report an error if blacklist file contains a malformed regex. fixes asan issue 17

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146503 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kostya Serebryany
2011-12-13 19:34:53 +00:00
parent 8a9bce978f
commit 085cb8f0b9
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Transforms/Instrumentation/AddressSanitizer.cpp
View File

@@ -979,15 +979,23 @@ BlackList::BlackList(const std::string &Path) {
for (size_t i = 0, numLines = Lines.size(); i < numLines; i++) { for (size_t i = 0, numLines = Lines.size(); i < numLines; i++) {
if (Lines[i].startswith(kFunPrefix)) { if (Lines[i].startswith(kFunPrefix)) {
std::string ThisFunc = Lines[i].substr(strlen(kFunPrefix)); std::string ThisFunc = Lines[i].substr(strlen(kFunPrefix));
if (Fun.size()) { std::string ThisFuncRE;
Fun += "|";
}
// add ThisFunc replacing * with .* // add ThisFunc replacing * with .*
for (size_t j = 0, n = ThisFunc.size(); j < n; j++) { for (size_t j = 0, n = ThisFunc.size(); j < n; j++) {
if (ThisFunc[j] == '*') if (ThisFunc[j] == '*')
Fun += '.'; ThisFuncRE += '.';
Fun += ThisFunc[j]; ThisFuncRE += ThisFunc[j];
} }
// Check that the regexp is valid.
Regex CheckRE(ThisFuncRE);
std::string Error;
if (!CheckRE.isValid(Error))
report_fatal_error("malformed blacklist regex: " + ThisFunc +
": " + Error);
// Append to the final regexp.
if (Fun.size())
Fun += "|";
Fun += ThisFuncRE;
} }
} }
if (Fun.size()) { if (Fun.size()) {