test/drogon
1
0
Fork 0
mirror of https://gitee.com/an-tao/drogon.git synced 2024-12-03 12:18:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Handle gzip errors safely (#305)

Browse Source
This commit is contained in:
An Tao 2019-11-29 00:28:12 +08:00 committed by GitHub
parent 93c0d7e9da
commit 2784a91dcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/src/Utilities.cc
View File

@ -707,7 +707,10 @@ std::string gzipCompress(const char *data, const size_t ndata)
MAX_WBITS + 16,
8,
Z_DEFAULT_STRATEGY) != Z_OK)
return nullptr;
{
LOG_ERROR << "deflateInit2 error!";
return std::string{};
}
std::string outstr;
outstr.resize(compressBound(ndata));
strm.next_in = (Bytef *)data;
@ -715,9 +718,15 @@ std::string gzipCompress(const char *data, const size_t ndata)
strm.next_out = (Bytef *)outstr.data();
strm.avail_out = outstr.length();
if (deflate(&strm, Z_FINISH) != Z_STREAM_END)
return nullptr;
{
LOG_ERROR << "deflate error!";
return std::string{};
}
if (deflateEnd(&strm) != Z_OK)
return nullptr;
{
LOG_ERROR << "deflateEnd error!";
return std::string{};
}
outstr.resize(strm.total_out);
return outstr;
}
@ -741,7 +750,10 @@ std::string gzipDecompress(const char *data, const size_t ndata)
strm.zalloc = Z_NULL;
strm.zfree = Z_NULL;
if (inflateInit2(&strm, (15 + 32)) != Z_OK)
return nullptr;
{
LOG_ERROR << "inflateInit2 error!";
return std::string{};
}
while (!done)
{
// Make sure we have enough room and reset the lengths.