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

Validate CompressionLevel value is defined in BrotliStream ctor #57561

Merged
merged 5 commits into from
Nov 1, 2021
Merged

Validate CompressionLevel value is defined in BrotliStream ctor #57561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
844018d
Validate CompressionLevel value is defined in BrotliStream ctor
i3arnon Aug 17, 2021
465dd3a
Remove redundant validation, rename parameter so it makes sense in th…
carlossanlop Nov 1, 2021
5c98a3d
Add tests that validate CompressionLevel values outside of range.
carlossanlop Nov 1, 2021
170829a
Revert expression body to reduce number of changes.
carlossanlop Nov 1, 2021
d9f6a21
Remove unnecessary using.
carlossanlop Nov 1, 2021
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
6 changes: 3 additions & 3 deletions src/libraries/System.IO.Compression.Brotli/src/System/IO/Compression/BrotliUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ internal static partial class BrotliUtils
public const int Quality_Max = 11;
public const int MaxInputSize = int.MaxValue - 515; // 515 is the max compressed extra bytes

internal static int GetQualityFromCompressionLevel(CompressionLevel level) =>
level switch
internal static int GetQualityFromCompressionLevel(CompressionLevel compressionLevel) =>
compressionLevel switch
{
CompressionLevel.Optimal => Quality_Default,
CompressionLevel.NoCompression => Quality_Min,
CompressionLevel.Fastest => 1,
CompressionLevel.SmallestSize => Quality_Max,
_ => (int)level,
_ => throw new ArgumentException(SR.ArgumentOutOfRange_Enum, nameof(compressionLevel))
};
}
}
8 changes: 8 additions & 0 deletions src/libraries/System.IO.Compression.Brotli/tests/CompressionStreamUnitTests.Brotli.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ public class BrotliStreamUnitTests : CompressionStreamUnitTestBase
[OuterLoop("Test takes ~6 seconds to run")]
public override void FlushAsync_DuringWriteAsync() { base.FlushAsync_DuringWriteAsync(); }

[Theory]
[InlineData((CompressionLevel)(-1))]
[InlineData((CompressionLevel)4)]
public void Ctor_ArgumentValidation_InvalidCompressionLevel(CompressionLevel compressionLevel)
{
Assert.Throws<ArgumentException>(() => new BrotliStream(new MemoryStream(), compressionLevel));
}

[Fact]
public void InvalidQuality()
{
Expand Down