nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Merge pull request #13577 from NixOS/mergify/bp/2.28-maintenance/pr-13175

Browse source 
libutil/tarfile: Create the scratch `std::vector` only once (backport #13175)
This commit is contained in:
mergify[bot] 2025-07-30 13:26:14 +00:00 • committed by GitHub
commit 0d763f7ce2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libutil/tarfile.cc
View file

@ -182,6 +182,10 @@ time_t unpackTarfileToSink(TarArchive & archive, ExtendedFileSystemObjectSink &
{ {
time_t lastModified = 0; time_t lastModified = 0;
/* Only allocate the buffer once. Use the heap because 131 KiB is a bit too
much for the stack. */
std::vector<unsigned char> buf(128 * 1024);
for (;;) { for (;;) {
// FIXME: merge with extract_archive // FIXME: merge with extract_archive
struct archive_entry * entry; struct archive_entry * entry;
@ -216,7 +220,6 @@ time_t unpackTarfileToSink(TarArchive & archive, ExtendedFileSystemObjectSink &
crf.isExecutable(); crf.isExecutable();
while (true) { while (true) {
std::vector<unsigned char> buf(128 * 1024);
auto n = archive_read_data(archive.archive, buf.data(), buf.size()); auto n = archive_read_data(archive.archive, buf.data(), buf.size());
if (n < 0) if (n < 0)
throw Error("cannot read file '%s' from tarball", path); throw Error("cannot read file '%s' from tarball", path);