flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed StringCompression's GZIP handling for larger strings.

Browse Source
This commit is contained in:
madmaxoft 2014-04-02 11:56:10 +02:00
parent bcf5021feb
commit 3301c5be1f
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/StringCompression.cpp
View File

@ -53,7 +53,7 @@ int UncompressString(const char * a_Data, int a_Length, AString & a_Uncompressed
int CompressStringGZIP(const char * a_Data, int a_Length, AString & a_Compressed) int CompressStringGZIP(const char * a_Data, size_t a_Length, AString & a_Compressed)
{ {
// Compress a_Data into a_Compressed using GZIP; return Z_XXX error constants same as zlib's compress2() // Compress a_Data into a_Compressed using GZIP; return Z_XXX error constants same as zlib's compress2()
@ -83,6 +83,7 @@ int CompressStringGZIP(const char * a_Data, int a_Length, AString & a_Compressed
{ {
// Some data has been compressed. Consume the buffer and continue compressing // Some data has been compressed. Consume the buffer and continue compressing
a_Compressed.append(Buffer, sizeof(Buffer) - strm.avail_out); a_Compressed.append(Buffer, sizeof(Buffer) - strm.avail_out);
strm.next_out = (Bytef *)Buffer;
strm.avail_out = sizeof(Buffer); strm.avail_out = sizeof(Buffer);
if (strm.avail_in == 0) if (strm.avail_in == 0)
{ {
@ -116,7 +117,7 @@ int CompressStringGZIP(const char * a_Data, int a_Length, AString & a_Compressed
extern int UncompressStringGZIP(const char * a_Data, int a_Length, AString & a_Uncompressed) extern int UncompressStringGZIP(const char * a_Data, size_t a_Length, AString & a_Uncompressed)
{ {
// Uncompresses a_Data into a_Uncompressed using GZIP; returns Z_OK for success or Z_XXX error constants same as zlib // Uncompresses a_Data into a_Uncompressed using GZIP; returns Z_OK for success or Z_XXX error constants same as zlib
@ -139,13 +140,14 @@ extern int UncompressStringGZIP(const char * a_Data, int a_Length, AString & a_U
for (;;) for (;;)
{ {
res = inflate(&strm, Z_FINISH); res = inflate(&strm, Z_NO_FLUSH);
switch (res) switch (res)
{ {
case Z_OK: case Z_OK:
{ {
// Some data has been uncompressed. Consume the buffer and continue uncompressing // Some data has been uncompressed. Consume the buffer and continue uncompressing
a_Uncompressed.append(Buffer, sizeof(Buffer) - strm.avail_out); a_Uncompressed.append(Buffer, sizeof(Buffer) - strm.avail_out);
strm.next_out = (Bytef *)Buffer;
strm.avail_out = sizeof(Buffer); strm.avail_out = sizeof(Buffer);
if (strm.avail_in == 0) if (strm.avail_in == 0)
{ {

4
src/StringCompression.h
View File

@ -16,10 +16,10 @@ extern int CompressString(const char * a_Data, int a_Length, AString & a_Compres
extern int UncompressString(const char * a_Data, int a_Length, AString & a_Uncompressed, int a_UncompressedSize); extern int UncompressString(const char * a_Data, int a_Length, AString & a_Uncompressed, int a_UncompressedSize);
/// Compresses a_Data into a_Compressed using GZIP; returns Z_OK for success or Z_XXX error constants same as zlib /// Compresses a_Data into a_Compressed using GZIP; returns Z_OK for success or Z_XXX error constants same as zlib
extern int CompressStringGZIP(const char * a_Data, int a_Length, AString & a_Compressed); extern int CompressStringGZIP(const char * a_Data, size_t a_Length, AString & a_Compressed);
/// Uncompresses a_Data into a_Uncompressed using GZIP; returns Z_OK for success or Z_XXX error constants same as zlib /// Uncompresses a_Data into a_Uncompressed using GZIP; returns Z_OK for success or Z_XXX error constants same as zlib
extern int UncompressStringGZIP(const char * a_Data, int a_Length, AString & a_Uncompressed); extern int UncompressStringGZIP(const char * a_Data, size_t a_Length, AString & a_Uncompressed);