Skip to content

Make 7z able to handle symlinks in the NDK zip again #10392

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
jonathanpeppers merged 1 commit into from
Aug 8, 2025
Merged

Make 7z able to handle symlinks in the NDK zip again #10392

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
17 changes: 15 additions & 2 deletions build-tools/xaprepare/xaprepare/ToolRunners/SevenZipRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ partial class SevenZipRunner : ToolRunner
// Just an educated guess. The official download page had versions 19 and then 23+ available
// and the 19 one didn't support the `-snld` switch
static readonly Version snldMinVersion = new Version (20, 0);

// New switch was added in v25.01
// https://sourceforge.net/p/sevenzip/discussion/45797/thread/da14cd780b/
// https://github.com/ip7z/7zip/releases/tag/25.01
static readonly Version snld20MinVersion = new Version (25, 1);

Version version;

protected override string DefaultToolExecutableName => "7za";
Expand Down Expand Up @@ -126,8 +132,15 @@ void AddStandardArguments (ProcessRunner runner)
//
// https://sourceforge.net/p/sevenzip/discussion/45798/thread/187ce54fb0/
//
if (version >= snldMinVersion) {
Log.DebugLine ("Adding option to ignore dangerous symlinks");
// A new switch was added in version 25.01:
//
// https://sourceforge.net/p/sevenzip/discussion/45797/thread/da14cd780b/
// https://github.com/ip7z/7zip/releases/tag/25.01
if (version >= snld20MinVersion) {
Log.DebugLine ("Adding -snld20 option to ignore dangerous symlinks");
runner.AddArgument ("-snld20");
} else if (version >= snldMinVersion) {
Log.DebugLine ("Adding -snld option to ignore dangerous symlinks");
runner.AddArgument ("-snld");
}

Expand Down
Loading