Skip to content

[mono] MarshalingPInvokeScanner tolerates DLLs without metadata #89430

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 3 commits into from
Jul 26, 2023
Merged

[mono] MarshalingPInvokeScanner tolerates DLLs without metadata #89430

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fdb7f5
Acquire MetadataReader under try.
jandupej Jul 25, 2023
7a6ffc8
Logging failed metadata access.
jandupej Jul 25, 2023
b44ead0
Update src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/Marshaling…
jandupej Jul 26, 2023
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
13 changes: 12 additions & 1 deletion src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/MarshalingPInvokeScanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,18 @@ private bool IsAssemblyIncompatible(string assyPath, MinimalMarshalingTypeCompat
{
using FileStream file = new FileStream(assyPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
using PEReader peReader = new PEReader(file);
MetadataReader mdtReader = peReader.GetMetadataReader();
MetadataReader mdtReader;

try
{
mdtReader = peReader.GetMetadataReader();
}
catch(InvalidOperationException ex)
{
// If the DLL does not have metadata, the previous call will fail with InvalidOperationException.
Log.LogMessage(MessageImportance.Low, string.Format("Cannot read metadata in file {0}: {1}.", assyPath, ex.Message));
return false;
}

foreach(CustomAttributeHandle attrHandle in mdtReader.CustomAttributes)
{
Expand Down