Skip to content

Prevent AV in processinfo2 while suspended on Mono. #58099

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
lateralusX merged 1 commit into from
Aug 26, 2021
Merged

Prevent AV in processinfo2 while suspended on Mono. #58099

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
Prevent AV in processinfo2 while suspended on Mono. 
#55379 only fixed CoreCLR. This
commit makes similar fix in Mono as well, making sure
src/tests/tracing/eventpipe/diagnosticport runtime test pass on Mono.
  • Loading branch information
@lateralusX
lateralusX committed Aug 25, 2021
commit 87ddc8ec834c04bc8a74b5cff415b645fc9b3c35
10 changes: 9 additions & 1 deletion src/mono/mono/eventpipe/ep-rt-mono.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,15 @@ inline
const ep_char8_t *
ep_rt_entrypoint_assembly_name_get_utf8 (void)
{
return (const ep_char8_t *)m_image_get_assembly_name (mono_assembly_get_main ()->image);
MonoAssembly *main_assembly = mono_assembly_get_main ();
if (!main_assembly || !main_assembly->image)
return "";

const char *assembly_name = m_image_get_assembly_name (mono_assembly_get_main ()->image);
if (!assembly_name)
return "";

return (const ep_char8_t*)assembly_name;
}

static
Expand Down