Skip to content

Dispose backing streams and skip entries on extraction failure in TarExtractor and ZipExtractor #187

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

Draft
Copilot wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Dispose backing streams and skip entries on extraction failure in TarExtractor and ZipExtractor #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07b2d37
Initial plan
Copilot Jan 28, 2026
b947061
Initial commit - planning changes to TarExtractor error handling
Copilot Jan 28, 2026
2b2a9c2
Fix TarExtractor to dispose backing stream and skip failed entries
Copilot Jan 28, 2026
ea4d2a1
Fix ZipExtractor to dispose backing stream and skip failed entries
Copilot Jan 28, 2026
90261d1
Use passthroughStream in ZipExtractor to reduce allocations
Copilot Feb 12, 2026
51e9532
Merge branch 'main' into copilot/fix-tar-extractor-fail-fast
gfs Feb 12, 2026
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: 4 additions & 0 deletions RecursiveExtractor/Extractors/TarExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
catch (Exception e)
{
Logger.Debug(Extractor.FAILED_PARSING_ERROR_MESSAGE_STRING, ArchiveFileType.TAR, fileEntry.FullPath, tarEntry.Key, e.GetType());
fs?.Dispose();
continue;
}
var name = tarEntry.Key?.Replace('/', Path.DirectorySeparatorChar);
if (string.IsNullOrEmpty(name))
Expand Down Expand Up @@ -132,6 +134,8 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
catch (Exception e)
{
Logger.Debug(Extractor.FAILED_PARSING_ERROR_MESSAGE_STRING, ArchiveFileType.TAR, fileEntry.FullPath, tarEntry.Key, e.GetType());
fs?.Dispose();
continue;
}
var name = tarEntry.Key?.Replace('/', Path.DirectorySeparatorChar);
if (string.IsNullOrEmpty(name))
Expand Down
9 changes: 6 additions & 3 deletions RecursiveExtractor/Extractors/ZipExtractor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,10 @@ public async IAsyncEnumerable<FileEntry> ExtractAsync(FileEntry fileEntry, Extra
catch (Exception e)
{
Logger.Debug(Extractor.FAILED_PARSING_ERROR_MESSAGE_STRING, ArchiveFileType.ZIP, fileEntry.FullPath, zipEntry.Key, e.GetType());
target?.Dispose();
continue;
}

target ??= new MemoryStream();
var name = zipEntry.Key?.Replace('/', Path.DirectorySeparatorChar) ?? "";
var newFileEntry = new FileEntry(name, target, fileEntry, modifyTime: zipEntry.LastModifiedTime, memoryStreamCutoff: options.MemoryStreamCutoff);
Copy link

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

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

The async method should also use passthroughStream: true parameter when creating the FileEntry, consistent with the sync method and the TarExtractor pattern. Since the backing stream is already populated via CopyToAsync, setting this parameter avoids unnecessary stream re-copying in the FileEntry constructor, improving performance and reducing allocations.

Suggested change
var newFileEntry = new FileEntry(name, target, fileEntry, modifyTime: zipEntry.LastModifiedTime, memoryStreamCutoff: options.MemoryStreamCutoff);
var newFileEntry = new FileEntry(name, target, fileEntry, modifyTime: zipEntry.LastModifiedTime, memoryStreamCutoff: options.MemoryStreamCutoff, passthroughStream: true);

Copilot uses AI. Check for mistakes.

Expand Down Expand Up @@ -222,7 +223,7 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
{
governor.CheckResourceGovernor(zipEntry.Size);

using var fs = StreamFactory.GenerateAppropriateBackingStream(options, zipEntry.Size);
var fs = StreamFactory.GenerateAppropriateBackingStream(options, zipEntry.Size);

try
{
Expand All @@ -232,10 +233,12 @@ public IEnumerable<FileEntry> Extract(FileEntry fileEntry, ExtractorOptions opti
catch (Exception e)
{
Logger.Debug(Extractor.FAILED_PARSING_ERROR_MESSAGE_STRING, ArchiveFileType.ZIP, fileEntry.FullPath, zipEntry.Key, e.GetType());
fs?.Dispose();
continue;
}

var name = zipEntry.Key?.Replace('/', Path.DirectorySeparatorChar) ?? "";
var newFileEntry = new FileEntry(name, fs, fileEntry, modifyTime: zipEntry.LastModifiedTime, memoryStreamCutoff: options.MemoryStreamCutoff);
var newFileEntry = new FileEntry(name, fs, fileEntry, passthroughStream: true, modifyTime: zipEntry.LastModifiedTime, memoryStreamCutoff: options.MemoryStreamCutoff);

if (options.Recurse || topLevel)
{
Expand Down
Loading