Skip to content

Enable extracting 7zNNNN-x64.exe with win32_extract_self_extracting_7z #1506

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
merged 1 commit into from
Oct 9, 2024
Merged

Enable extracting 7zNNNN-x64.exe with win32_extract_self_extracting_7z #1506

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
18 changes: 14 additions & 4 deletions src/vcpkg/archives.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ namespace vcpkg
#ifdef _WIN32
void win32_extract_self_extracting_7z(const Filesystem& fs, const Path& archive, const Path& to_path)
{
constexpr static const char header_7z[] = "7z\xBC\xAF\x27\x1C";
static constexpr StringLiteral header_7z = "7z\xBC\xAF\x27\x1C";
const Path stem = archive.stem();
const auto subext = stem.extension();
Checks::msg_check_exit(VCPKG_LINE_INFO,
Expand All @@ -251,14 +251,24 @@ namespace vcpkg
.append(msgMissingExtension, msg::extension = ".7.exe"));

auto contents = fs.read_contents(archive, VCPKG_LINE_INFO);
const auto pos = contents.find(header_7z);

// try to chop off the beginning of the self extractor before the embedded 7z archive
// some 7z self extractors, such as PortableGit-2.43.0-32-bit.7z.exe have 1 header
// some 7z self extractors, such as 7z2408-x64.exe, have 2 headers
auto pos = contents.find(header_7z.data(), 0, header_7z.size());
Checks::msg_check_exit(VCPKG_LINE_INFO,
pos != std::string::npos,
msg::format(msgPackageFailedtWhileExtracting, msg::value = "7zip", msg::path = archive)
.append(msgMissing7zHeader));
// no bounds check necessary because header_7z is nonempty:
auto pos2 = contents.find(header_7z.data(), pos + 1, header_7z.size());
if (pos2 != std::string::npos)
{
pos = pos2;
}

contents = contents.substr(pos);
fs.write_contents(to_path, contents, VCPKG_LINE_INFO);
StringView contents_sv = contents;
fs.write_contents(to_path, contents_sv.substr(pos), VCPKG_LINE_INFO);
}
#endif

Expand Down
Loading