Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1619865 - Support pdb paths with forward slashes. r=gerald

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D65286

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2020-03-04 08:02:42 +00:00
parent 2d8df288cb
commit 1a58a0ff4f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozglue/baseprofiler/core/shared-libraries-win32.cc
View File

@ -211,13 +211,13 @@ SharedLibraryInfo SharedLibraryInfo::GetInfoForSelf() {
AppendHex(pdbAge, breakpadId, WITHOUT_PADDING);
pdbPathStr = pdbName;
size_t pos = pdbPathStr.rfind('\\');
size_t pos = pdbPathStr.find_last_of("\\/");
pdbNameStr =
(pos != std::string::npos) ? pdbPathStr.substr(pos + 1) : pdbPathStr;
}
std::string modulePathStr(modulePath);
size_t pos = modulePathStr.rfind('\\');
size_t pos = modulePathStr.find_last_of("\\/");
std::string moduleNameStr = (pos != std::string::npos)
? modulePathStr.substr(pos + 1)
: modulePathStr;

4
tools/profiler/core/shared-libraries-win32.cc
View File

@ -144,7 +144,7 @@ SharedLibraryInfo SharedLibraryInfo::GetInfoForSelf() {
nsAutoString modulePathStr(modulePath);
nsAutoString moduleNameStr = modulePathStr;
int32_t pos = moduleNameStr.RFindChar('\\');
int32_t pos = moduleNameStr.RFindCharInSet(u"\\/");
if (pos != kNotFound) {
moduleNameStr.Cut(0, pos + 1);
}
@ -210,7 +210,7 @@ SharedLibraryInfo SharedLibraryInfo::GetInfoForSelf() {
pdbPathStr = NS_ConvertUTF8toUTF16(pdbName);
pdbNameStr = pdbPathStr;
int32_t pos = pdbNameStr.RFindChar('\\');
int32_t pos = pdbNameStr.RFindCharInSet(u"\\/");
if (pos != kNotFound) {
pdbNameStr.Cut(0, pos + 1);
}