Skip to content

[release/7.0-staging] Fix createdump arg parsing for signal-based exceptions #85423

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 1 commit into from
Apr 28, 2023
Merged

[release/7.0-staging] Fix createdump arg parsing for signal-based exceptions #85423

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/coreclr/debug/createdump/createdump.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ typedef struct
int Pid;
int CrashThread;
int Signal;
#if defined(HOST_UNIX) && !defined(HOST_OSX)
#if defined(HOST_UNIX)
int SignalCode;
int SignalErrno;
void* SignalAddress;
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/debug/createdump/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ int __cdecl main(const int argc, const char* argv[])
options.Signal = 0;
options.CrashThread = 0;
options.Pid = 0;
#if defined(HOST_UNIX) && !defined(HOST_OSX)
#if defined(HOST_UNIX)
options.SignalCode = 0;
options.SignalErrno = 0;
options.SignalAddress = nullptr;
Expand Down Expand Up @@ -161,7 +161,6 @@ int __cdecl main(const int argc, const char* argv[])
{
g_checkForSingleFile = true;
}
#ifndef HOST_OSX
else if (strcmp(*argv, "--code") == 0)
{
options.SignalCode = atoi(*++argv);
Expand All @@ -174,7 +173,6 @@ int __cdecl main(const int argc, const char* argv[])
{
options.SignalAddress = (void*)atoll(*++argv);
}
#endif
#endif
else if ((strcmp(*argv, "-d") == 0) || (strcmp(*argv, "--diag") == 0))
{
Expand Down