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.

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

Add sanity check for length of a PE resource type name #974

Merged
merged 2 commits into from
Jul 12, 2021
Merged
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions src/pelib/ResourceDirectory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,17 @@ namespace PeLib
return ERROR_INVALID_FILE;
}

// Read the resource name
imageLoader.readStringRc(rc.entry.wstrName, uiRsrcRva + uiNameOffset);
std::uint16_t length = 0;
std::uint32_t name_rva = uiRsrcRva + uiNameOffset;
// Read the string length (first 2 bytes at start)
imageLoader.readImage(&length, name_rva, sizeof(std::uint16_t));

// Sanity check for pointer to junk data instead of valid string
if (length <= 100)
{
// Read the resource name
imageLoader.readStringRc(rc.entry.wstrName, name_rva);
}
}
}

Expand Down