Skip to content
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

Jump to bottom

[release/9.0] Initialize managed and native values in the ICustomMarshaler marshaler to null when the other is null. #109096

Merged
merged 2 commits into from
Oct 22, 2024
Merged

[release/9.0] Initialize managed and native values in the ICustomMarshaler marshaler to null when the other is null. #109096

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b699102
Initialize managed and native values to null when the other is null.
jkoritzinsky Oct 21, 2024
47e77c6
Update StubHelpers.cs
jkoritzinsky Oct 21, 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
4 changes: 3 additions & 1 deletion src/coreclr/System.Private.CoreLib/src/System/StubHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,17 +807,19 @@ internal static unsafe void ConvertContentsToNative(ICustomMarshaler marshaler,
// COMPAT: We never pass null to MarshalManagedToNative.
if (pManagedHome is null)
{
*pNativeHome = IntPtr.Zero;
return;
}

*pNativeHome = marshaler.MarshalManagedToNative(pManagedHome);
}

internal static void ConvertContentsToManaged(ICustomMarshaler marshaler, ref object pManagedHome, IntPtr* pNativeHome)
internal static void ConvertContentsToManaged(ICustomMarshaler marshaler, ref object? pManagedHome, IntPtr* pNativeHome)
{
// COMPAT: We never pass null to MarshalNativeToManaged.
if (*pNativeHome == IntPtr.Zero)
{
pManagedHome = null;
return;
}

Expand Down
Loading