Skip to content

Fix crash when event does not have Add method and improve message for some other internal errors #2409

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
filmor merged 3 commits into from
Jul 2, 2024
Merged

Fix crash when event does not have Add method and improve message for some other internal errors #2409

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
790b7c8
not all events have Add method
lostmsu Jul 1, 2024
dfb46a6
give users some idea of why we might be unable to reflect .NET types …
lostmsu Jul 1, 2024
772fa05
mentioned event Add method crash fix in changelog
lostmsu Jul 1, 2024
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
Next Next commit
not all events have Add method 
fixes #2405
  • Loading branch information
@lostmsu
lostmsu committed Jul 1, 2024
commit 790b7c843d4dc12365f52afffe93a9f795c0942a
4 changes: 3 additions & 1 deletion src/runtime/ClassManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,13 @@ internal static void InitClassBase(Type type, ClassBase impl, ReflectedClrType p

internal static bool ShouldBindMethod(MethodBase mb)
{
if (mb is null) throw new ArgumentNullException(nameof(mb));
return (mb.IsPublic || mb.IsFamily || mb.IsFamilyOrAssembly);
}

internal static bool ShouldBindField(FieldInfo fi)
{
if (fi is null) throw new ArgumentNullException(nameof(fi));
return (fi.IsPublic || fi.IsFamily || fi.IsFamilyOrAssembly);
}

Expand Down Expand Up @@ -326,7 +328,7 @@ internal static bool ShouldBindProperty(PropertyInfo pi)

internal static bool ShouldBindEvent(EventInfo ei)
{
return ShouldBindMethod(ei.GetAddMethod(true));
return ei.GetAddMethod(true) is { } add && ShouldBindMethod(add);
}

private static ClassInfo GetClassInfo(Type type, ClassBase impl)
Expand Down