diff options
| author | Nelson Billing <nbilling@google.com> | 2019-06-25 15:56:50 -0700 |
|---|---|---|
| committer | Nelson Billing <nbilling@google.com> | 2019-06-25 23:24:24 +0000 |
| commit | b62101dead2e9dd10e14252e8b68fbdf56bb40d2 (patch) | |
| tree | 5f5042369d87b601c455895c46c15d2138e85c80 | |
| parent | Fix dump_syms clang Windows build. (diff) | |
| download | breakpad-b62101dead2e9dd10e14252e8b68fbdf56bb40d2.tar.xz | |
Fix windows symbol converter blacklisting.
- Was attempting "full match" when we meant to do "partial match".
Change-Id: Ia748a7fc8707e11f44c205e57f218f5f4bbc5612
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1676936
Reviewed-by: Ivan Penkov <ivanpe@chromium.org>
| -rw-r--r-- | src/tools/windows/converter_exe/converter.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/windows/converter_exe/converter.cc b/src/tools/windows/converter_exe/converter.cc index 9418ecaa..df87c7b5 100644 --- a/src/tools/windows/converter_exe/converter.cc +++ b/src/tools/windows/converter_exe/converter.cc @@ -276,11 +276,12 @@ static bool SendFetchFailedPing(const wstring &fetch_symbol_failure_url, // external request unless the symbol file's debug_file string matches
// the given blacklist regular expression.
// The debug_file name is used from the MissingSymbolInfo struct,
-// matched against the PCRE blacklist_regex.
+// matched against the blacklist_regex.
static bool SafeToMakeExternalRequest(const MissingSymbolInfo &missing_info,
std::regex blacklist_regex) {
string file_name = missing_info.debug_file;
- if (std::regex_match(file_name, blacklist_regex)) {
+ // Use regex_search because we want to match substrings.
+ if (std::regex_search(file_name, blacklist_regex)) {
FprintfFlush(stderr, "Not safe to make external request for file %s\n",
file_name.c_str());
return false;
|