Skip to content

Fixed exportTriepresent with export offset and size check #7009

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

Closed
hongyu-dev wants to merge 1 commit into from
Closed

Fixed exportTriepresent with export offset and size check #7009

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
8 changes: 6 additions & 2 deletions view/macho/machoview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,14 +696,18 @@ MachOHeader MachoView::HeaderForAddress(BinaryView* data, uint64_t address, bool
header.dyldInfo.export_size = reader.Read32();
header.exportTrie.dataoff = header.dyldInfo.export_off;
header.exportTrie.datasize = header.dyldInfo.export_size;
header.exportTriePresent = true;
// Only mark export trie as present if there's actually data
if (header.dyldInfo.export_off != 0 && header.dyldInfo.export_size != 0)
header.exportTriePresent = true;
header.dyldInfoPresent = true;
break;
case LC_DYLD_EXPORTS_TRIE:
m_logger->LogDebug("LC_DYLD_EXPORTS_TRIE\n");
header.exportTrie.dataoff = reader.Read32();
header.exportTrie.datasize = reader.Read32();
header.exportTriePresent = true;
// Only mark export trie as present if there's actually data
if (header.exportTrie.dataoff != 0 && header.exportTrie.datasize != 0)
header.exportTriePresent = true;
break;
case LC_THREAD:
case LC_UNIXTHREAD:
Expand Down
Loading