Skip to content

Do not clone empty arrays in CloneByteArray #93231

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 2 commits into from
Oct 9, 2023
Merged

Do not clone empty arrays in CloneByteArray #93231

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e85362
Do not clone empty arrays in CloneByteArray
vcsjones Oct 9, 2023
e857699
Fix compilation.
vcsjones Oct 9, 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
10 changes: 5 additions & 5 deletions src/libraries/Common/src/System/Security/Cryptography/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ internal static partial class Helpers
[return: NotNullIfNotNull(nameof(src))]
public static byte[]? CloneByteArray(this byte[]? src)
{
if (src == null)
return src switch
{
return null;
}

return (byte[])(src.Clone());
null => null,
{ Length: 0 } => src,
_ => (byte[])src.Clone(),
};
Comment on lines +48 to +53
Copy link
Member

@stephentoub stephentoub Oct 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, it could also have been:

return src is not null ? src.AsSpan().ToArray() : null;

and let span's ToArray handle the empty case via Array.Empty.

}

internal static bool TryCopyToDestination(this ReadOnlySpan<byte> source, Span<byte> destination, out int bytesWritten)
Expand Down