Merge pull request #11058 from shuffle2/updater-inflate

Updater: Move inflate intermediate buffer to heap and enlarge
This commit is contained in:
Admiral H. Curtiss 2022-09-20 02:45:50 +02:00 committed by GitHub
commit d04e1ca96a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions

View File

@ -4,6 +4,7 @@
#include "UpdaterCommon/UpdaterCommon.h"
#include <array>
#include <memory>
#include <optional>
#include <OptionParser.h>
@ -132,16 +133,17 @@ std::optional<std::string> GzipInflate(const std::string& data)
inflateInit2(&zstrm, 16 + MAX_WBITS);
std::string out;
char buffer[4096];
const size_t buf_len = 20 * 1024 * 1024;
auto buffer = std::make_unique<char[]>(buf_len);
int ret;
do
{
zstrm.avail_out = sizeof(buffer);
zstrm.next_out = reinterpret_cast<u8*>(buffer);
zstrm.avail_out = buf_len;
zstrm.next_out = reinterpret_cast<u8*>(buffer.get());
ret = inflate(&zstrm, 0);
out.append(buffer, sizeof(buffer) - zstrm.avail_out);
out.append(buffer.get(), buf_len - zstrm.avail_out);
} while (ret == Z_OK);
inflateEnd(&zstrm);