Skip to content

Fix UB due to iterator reaching before begin() in rich header parsing #987

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

Merged
merged 2 commits into from
Jul 15, 2021
Merged

Fix UB due to iterator reaching before begin() in rich header parsing #987

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07675b7
Fix UB due to iterator before begin()
HoundThe Jul 15, 2021
415298c
pelib/RichHeader: change it++ to ++it
PeterMatula Jul 15, 2021
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
6 changes: 3 additions & 3 deletions src/pelib/RichHeader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,15 +882,15 @@ namespace

// Start analyzing from the end - "Rich" marker
// and move upwards to decrypted "DanS" marker
for (auto i = richSignature - 1; i >= rich.begin(); --i)
for (auto it = std::make_reverse_iterator(richSignature); it < rich.rend(); ++it)
{
std::uint32_t decrypted_dword = *i ^ key;
std::uint32_t decrypted_dword = *it ^ key;
decryptedHeader.push_back(decrypted_dword);
// "DanS" - 0x536e6144 signals the start (end) of the rich header
if (decrypted_dword == 0x536e6144)
{
// Set the offset to "DanS"
this->offset = (i - rich.begin()) * 4;
this->offset = std::distance(it + 1, rich.rend()) * 4;
// Because we are analysing bottom up, reverse the vector
std::reverse(decryptedHeader.begin(), decryptedHeader.end());
break;
Expand Down