Skip to content

[release/7.0] Ensure we cleanup the marshalling for elements of collections (stateful and stateless) #76693

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
carlossanlop merged 7 commits into from
Oct 7, 2022
Merged

[release/7.0] Ensure we cleanup the marshalling for elements of collections (stateful and stateless) #76693

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
baba1b5
Ensure we cleanup the marshalling for elements of collections (statef…
jkoritzinsky Oct 4, 2022
bf30321
Add tests
jkoritzinsky Oct 4, 2022
0106a6c
Fix bad stackalloc size after we moved to strongly-typed buffers
jkoritzinsky Oct 4, 2022
9b3c2a7
PR feedback
jkoritzinsky Oct 4, 2022
eea4dd3
Update NonBlittable.cs
AaronRobinsonMSFT Oct 5, 2022
7f36fef
Propagate details for types.
AaronRobinsonMSFT Oct 6, 2022
dbc3abf
Update src/libraries/System.Runtime.InteropServices/gen/Microsoft.Int…
jkoritzinsky Oct 6, 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
Prev Previous commit
Next Next commit
Update NonBlittable.cs
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT authored and github-actions committed Oct 5, 2022
commit eea4dd3d4ebc7cd8bd1eb9ca5cc1afaa4992b0cc
8 changes: 4 additions & 4 deletions src/libraries/System.Runtime.InteropServices/tests/TestAssets/SharedTypes/NonBlittable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,14 +502,14 @@ public void FromManaged(List<T> managed, Span<TUnmanagedElement> buffer)

_list = managed;
// Always allocate at least one byte when the list is zero-length.
int spaceToAllocate = Math.Max(managed.Count, 1);
if (spaceToAllocate <= buffer.Length)
int countToAllocate = Math.Max(managed.Count, 1);
if (countToAllocate <= buffer.Length)
{
_span = buffer[0..spaceToAllocate];
_span = buffer[0..countToAllocate];
}
else
{
_allocatedMemory = Marshal.AllocCoTaskMem(spaceToAllocate);
_allocatedMemory = Marshal.AllocCoTaskMem(countToAllocate * sizeof(TUnmanagedElement));
_span = new Span<TUnmanagedElement>((void*)_allocatedMemory, managed.Count);
}
}
Expand Down