Skip to content

Change ZipOutputStream.PutNextEntry to explicity validate the requested compression method #422

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
piksel merged 1 commit into from
Jun 19, 2020
+10 −0
Merged

Change ZipOutputStream.PutNextEntry to explicity validate the requested compression method #422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 10 additions & 0 deletions src/ICSharpCode.SharpZipLib/Zip/ZipOutputStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@ private void WriteLeLong(long value)
/// Entry name is too long<br/>
/// Finish has already been called<br/>
/// </exception>
/// <exception cref="System.NotImplementedException">
/// The Compression method specified for the entry is unsupported.
/// </exception>
public void PutNextEntry(ZipEntry entry)
{
if (entry == null)
Expand All @@ -229,6 +232,13 @@ public void PutNextEntry(ZipEntry entry)
}

CompressionMethod method = entry.CompressionMethod;

// Check that the compression is one that we support
if (method != CompressionMethod.Deflated && method != CompressionMethod.Stored)
{
throw new NotImplementedException("Compression method not supported");
}

int compressionLevel = defaultCompressionLevel;

// Clear flags that the library manages internally
Expand Down