summaryrefslogtreecommitdiffstats
path: root/src/libutil/archive.cc
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-03-01 15:00:58 -0600
committerWill Dietz <w@wdtz.org>2018-03-02 10:52:04 -0600
commitc89a3d536891da84403b025c70f1ae225faa0eb2 (patch)
treec019b3b8ead8a0c609d9a54db70e27904811863e /src/libutil/archive.cc
parent3748a0ca1e9406ff4a701b4f0e1f506c008c4137 (diff)
don't allocate large buffers on the stack
Diffstat (limited to 'src/libutil/archive.cc')
-rw-r--r--src/libutil/archive.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index f71229d8f..59be91c5c 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -40,14 +40,14 @@ static void dumpContents(const Path & path, size_t size,
AutoCloseFD fd = open(path.c_str(), O_RDONLY | O_CLOEXEC);
if (!fd) throw SysError(format("opening file '%1%'") % path);
- unsigned char buf[65536];
+ std::vector<unsigned char> buf(65536);
size_t left = size;
while (left > 0) {
- size_t n = left > sizeof(buf) ? sizeof(buf) : left;
- readFull(fd.get(), buf, n);
+ size_t n = left > buf.size() ? buf.size() : left;
+ readFull(fd.get(), buf.data(), n);
left -= n;
- sink(buf, n);
+ sink(buf.data(), n);
}
writePadding(size, sink);
@@ -146,14 +146,14 @@ static void parseContents(ParseSink & sink, Source & source, const Path & path)
sink.preallocateContents(size);
unsigned long long left = size;
- unsigned char buf[65536];
+ std::vector<unsigned char> buf(65536);
while (left) {
checkInterrupt();
- unsigned int n = sizeof(buf);
- if ((unsigned long long) n > left) n = left;
- source(buf, n);
- sink.receiveContents(buf, n);
+ auto n = buf.size();
+ if ((unsigned long long)n > left) n = left;
+ source(buf.data(), n);
+ sink.receiveContents(buf.data(), n);
left -= n;
}