Skip to content

Include all dlerror messages to DllNotFoundException #70964

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 4 commits into from
Jun 22, 2022
Merged

Include all dlerror messages to DllNotFoundException #70964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c57ccb0
exclude incorrect dlerror message from DllNotFoundException
HJLeee Jun 20, 2022
9344fa1
Include all error messages
HJLeee Jun 20, 2022
6867726
Apply Feedbacks
HJLeee Jun 20, 2022
d24fdf5
Apply Feedback 2
HJLeee Jun 21, 2022
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
9 changes: 8 additions & 1 deletion ...System.Private.CoreLib/src/System/Runtime/InteropServices/NativeLibrary.NativeAot.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@ public void Throw(string libraryName)

public void TrackErrorMessage(string? message)
{
_errorMessage = message;
if (_errorMessage == null)
{
_errorMessage = Environment.NewLine;
}
if (!_errorMessage.Contains(message))
{
_errorMessage += message + Environment.NewLine;
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions src/coreclr/vm/nativelibrary.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ namespace
LIMITED_METHOD_CONTRACT;
m_hr = E_FAIL;
m_priorityOfLastError = 0;
m_message = SString(SString::Utf8, "\n");
}

VOID TrackErrorCode()
Expand Down Expand Up @@ -137,7 +138,18 @@ namespace

void SetMessage(LPCSTR message)
{
#ifdef TARGET_UNIX
//Append dlerror() messages
SString new_message = SString(SString::Utf8, message);
SString::Iterator i = m_message.Begin();
if (!m_message.Find(i, new_message))
{
m_message += new_message;
m_message += SString(SString::Utf8, "\n");
}
#else
m_message = SString(SString::Utf8, message);
#endif
}

HRESULT m_hr;
Expand Down