Skip to content

Fix: Fixed an issue where archives with reserved item names wouldn't extract correctly #18070

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

Open
Lamparter wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −8
Open

Fix: Fixed an issue where archives with reserved item names wouldn't extract correctly #18070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
729565d
Fix "." and ".." in archives being extracted wrong
Lamparter Jan 17, 2026
f8b0984
Respond to Copilot comment
Lamparter Jan 24, 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
26 changes: 18 additions & 8 deletions src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,25 @@ protected async Task DecompressArchiveHereAsync(bool smart = false)
if (zipFile is null)
return true;

return zipFile.ArchiveFileData.Select(file =>
static string? GetFirstMeaningfulSegment(string? fileName)
{
var pathCharIndex = file.FileName.IndexOfAny(['/', '\\']);
if (pathCharIndex == -1)
return file.FileName;
else
return file.FileName.Substring(0, pathCharIndex);
})
.Distinct().Count() > 1;
if (string.IsNullOrEmpty(fileName))
return null;

var parts = fileName.Split(['/', '\\'], StringSplitOptions.RemoveEmptyEntries);
foreach (var part in parts.Where(part => part is not "." and not ".."))
return part;

return null;
}

var topLevelEntries = zipFile.ArchiveFileData
.Select(file => GetFirstMeaningfulSegment(file.FileName))
.Where(x => !string.IsNullOrEmpty(x))
.Distinct()
.Count();

return topLevelEntries > 1;
});

if (smart && currentFolder is not null && isMultipleItems)
Expand Down
Loading