Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix superpmi.exe handling of exclusion lists #62349

Merged
merged 1 commit into from
Dec 3, 2021
Merged

Fix superpmi.exe handling of exclusion lists #62349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/coreclr/ToolBox/superpmi/superpmi-shared/methodcontextreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@ std::string MethodContextReader::CheckForPairedFile(const std::string& fileName,
{
std::string tmp = to_lower(origSuffix);

// First, check to see if foo.origSuffix exists
// First, check to see if foo.origSuffix exists and is not a directory name
size_t suffix_offset = fileName.find_last_of('.');
if ((SSIZE_T)suffix_offset <= 0 || (tmp != to_lower(fileName.substr(suffix_offset))) ||
(GetFileAttributesA(fileName.c_str()) == INVALID_FILE_ATTRIBUTES))
if ((SSIZE_T)suffix_offset <= 0 || (tmp != to_lower(fileName.substr(suffix_offset))))
return std::string();

DWORD attribs = GetFileAttributesA(fileName.c_str());
if ((attribs == INVALID_FILE_ATTRIBUTES) || (attribs & FILE_ATTRIBUTE_DIRECTORY))
return std::string();

// next, check foo.orig.new from foo.orig
tmp = fileName + newSuffix;
if (GetFileAttributesA(tmp.c_str()) != INVALID_FILE_ATTRIBUTES)
return tmp;

// Now let's check for foo.new from foo.new.orig
tmp = fileName.substr(0, suffix_offset);
if (GetFileAttributesA(tmp.c_str()) != INVALID_FILE_ATTRIBUTES)
attribs = GetFileAttributesA(tmp.c_str());
if ((attribs != INVALID_FILE_ATTRIBUTES) && !(attribs & FILE_ATTRIBUTE_DIRECTORY))
return tmp;

// Finally, lets try foo.orig from foo.new
tmp += newSuffix;
if (GetFileAttributesA(tmp.c_str()) != INVALID_FILE_ATTRIBUTES)
// Finally, lets try foo.new from foo.orig
tmp = fileName.substr(0, suffix_offset) + newSuffix;
attribs = GetFileAttributesA(tmp.c_str());
if ((attribs != INVALID_FILE_ATTRIBUTES) && !(attribs & FILE_ATTRIBUTE_DIRECTORY))
return tmp;

return std::string();
Expand Down