shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

B #5219: Fix zlib_decompress (#772)

Browse Source
This commit is contained in:
Pavel Czerný 2021-02-09 09:10:58 +01:00 committed by GitHub
parent c3c3875b21
commit bb2571e367
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/NebulaUtil.cc
View File

@ -515,7 +515,7 @@ void one_util::split_unique(const string& st, char delim, set<string>& res)
/**
* Buffer length for zlib inflate/deflate
*/
#define ZBUFFER 65536
#define ZBUFFER 16384
string * one_util::zlib_compress(const string& in, bool base64)
{
@ -641,7 +641,8 @@ string * one_util::zlib_decompress(const string& in, bool base64)
rc = inflate(&zs, Z_FINISH);
if ( rc != Z_STREAM_END && rc != Z_OK )
if ( (rc != Z_STREAM_END && rc != Z_OK && rc != Z_BUF_ERROR)
|| (rc == Z_BUF_ERROR && zs.avail_out == ZBUFFER) )
{
inflateEnd(&zs);