Skip to content

Fix enumerating loaded process modules on Apple platforms #5487

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
May 22, 2025
Merged

Fix enumerating loaded process modules on Apple platforms #5487

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5b22e
Fix enumerating loaded process modules on Apple platforms
davidwrighton May 19, 2025
2ca010c
Try a less risky fix
davidwrighton May 19, 2025
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
22 changes: 21 additions & 1 deletion src/shared/pal/src/thread/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2371,7 +2371,27 @@ CreateProcessModules(
}
}

if (!dup)
// Does the offset in the module correspond to a valid MachO header?
bool isMachO = false;
int fd = open(moduleName, O_RDONLY);
if (fd != -1)
{
if (lseek(fd, rwpi.prp_prinfo.pri_offset, SEEK_SET) != (off_t)-1)
{
uint32_t magic = 0;
ssize_t bytesRead = read(fd, &magic, sizeof(magic));
if (bytesRead == sizeof(magic))
{
if (magic == 0xFEEDFACF)
Copy link
Member

@hoyosjs hoyosjs May 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (magic == 0xFEEDFACF)
if (magic == 0xFEEDFACF || magic == 0xFEEDFACE)

{
isMachO = true;
}
}
}
close(fd);
}

if (!dup && isMachO)
{
int cbModuleName = strlen(moduleName) + 1;
ProcessModules *entry = (ProcessModules *)malloc(sizeof(ProcessModules) + cbModuleName);
Expand Down