soutade/libgourou
3
6
Fork 4
Code Issues 1 Pull Requests Packages Releases 4 Activity

Update inflate/deflate with right flag (Z_FINISH, no Z_SYNC_FLUSH)

Browse Source
This commit is contained in:
Grégory Soutadé 2021-11-29 15:38:56 +01:00
parent 8129ec4423
commit 55ab41613e
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
utils/drmprocessorclientimpl.cpp
View File

@ -444,7 +444,7 @@ void DRMProcessorClientImpl::inflate(std::string data, gourou::ByteArray& result
if (ret != Z_OK) if (ret != Z_OK)
EXCEPTION(gourou::CLIENT_ZIP_ERROR, infstream.msg); EXCEPTION(gourou::CLIENT_ZIP_ERROR, infstream.msg);
ret = ::inflate(&infstream, Z_SYNC_FLUSH); ret = ::inflate(&infstream, Z_FINISH);
while (ret == Z_OK || ret == Z_STREAM_END) while (ret == Z_OK || ret == Z_STREAM_END)
{ {
result.append(buffer, dataSize-infstream.avail_out); result.append(buffer, dataSize-infstream.avail_out);
@ -452,10 +452,11 @@ void DRMProcessorClientImpl::inflate(std::string data, gourou::ByteArray& result
break; break;
infstream.avail_out = (uInt)dataSize; // size of output infstream.avail_out = (uInt)dataSize; // size of output
infstream.next_out = (Bytef *)buffer; // output char array infstream.next_out = (Bytef *)buffer; // output char array
ret = ::inflate(&infstream, Z_SYNC_FLUSH); ret = ::inflate(&infstream, Z_FINISH);
} }
inflateEnd(&infstream); if (ret == Z_STREAM_END)
ret = deflateEnd(&infstream);
delete[] buffer; delete[] buffer;
@ -464,7 +465,7 @@ void DRMProcessorClientImpl::inflate(std::string data, gourou::ByteArray& result
} }
void DRMProcessorClientImpl::deflate(std::string data, gourou::ByteArray& result, void DRMProcessorClientImpl::deflate(std::string data, gourou::ByteArray& result,
int wbits, int compressionLevel) int wbits, int compressionLevel)
{ {
unsigned int dataSize = data.size(); unsigned int dataSize = data.size();
unsigned char* buffer = new unsigned char[dataSize]; unsigned char* buffer = new unsigned char[dataSize];
@ -486,7 +487,7 @@ void DRMProcessorClientImpl::deflate(std::string data, gourou::ByteArray& result
if (ret != Z_OK) if (ret != Z_OK)
EXCEPTION(gourou::CLIENT_ZIP_ERROR, defstream.msg); EXCEPTION(gourou::CLIENT_ZIP_ERROR, defstream.msg);
ret = ::deflate(&defstream, Z_SYNC_FLUSH); ret = ::deflate(&defstream, Z_FINISH);
while (ret == Z_OK || ret == Z_STREAM_END) while (ret == Z_OK || ret == Z_STREAM_END)
{ {
result.append(buffer, dataSize-defstream.avail_out); result.append(buffer, dataSize-defstream.avail_out);
@ -494,10 +495,11 @@ void DRMProcessorClientImpl::deflate(std::string data, gourou::ByteArray& result
break; break;
defstream.avail_out = (uInt)dataSize; // size of output defstream.avail_out = (uInt)dataSize; // size of output
defstream.next_out = (Bytef *)buffer; // output char array defstream.next_out = (Bytef *)buffer; // output char array
ret = ::deflate(&defstream, Z_SYNC_FLUSH); ret = ::deflate(&defstream, Z_FINISH);
} }
deflateEnd(&defstream); if (ret == Z_STREAM_END)
ret = deflateEnd(&defstream);
delete[] buffer; delete[] buffer;