feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Fix deflate setup bug

Browse Source
This commit is contained in:
Vinnie Falco
2017-02-01 12:44:16 -05:00
parent 812271a782
commit e79f923c03
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -4,6 +4,7 @@
* Fix 32-bit arm7 warnings * Fix 32-bit arm7 warnings
* Remove unnecessary include * Remove unnecessary include
* WebSocket server examples and test tidying * WebSocket server examples and test tidying
* Fix deflate setup bug
API Changes: API Changes:

6
include/beast/zlib/detail/deflate_stream.hpp
View File

@@ -807,7 +807,7 @@ deflate_stream::get_lut() ->
//std::uint16_t bl_count[maxBits+1]; //std::uint16_t bl_count[maxBits+1];
// Initialize the mapping length (0..255) -> length code (0..28) // Initialize the mapping length (0..255) -> length code (0..28)
std::uint8_t length = 0; int length = 0;
for(std::uint8_t code = 0; code < lengthCodes-1; ++code) for(std::uint8_t code = 0; code < lengthCodes-1; ++code)
{ {
tables.base_length[code] = length; tables.base_length[code] = length;
@@ -815,11 +815,11 @@ deflate_stream::get_lut() ->
for(unsigned n = 0; n < run; ++n) for(unsigned n = 0; n < run; ++n)
tables.length_code[length++] = code; tables.length_code[length++] = code;
} }
BOOST_ASSERT(length == 0); BOOST_ASSERT(length == 256);
// Note that the length 255 (match length 258) can be represented // Note that the length 255 (match length 258) can be represented
// in two different ways: code 284 + 5 bits or code 285, so we // in two different ways: code 284 + 5 bits or code 285, so we
// overwrite length_code[255] to use the best encoding: // overwrite length_code[255] to use the best encoding:
tables.length_code[length-1] = lengthCodes-1; tables.length_code[255] = lengthCodes-1;
// Initialize the mapping dist (0..32K) -> dist code (0..29) // Initialize the mapping dist (0..32K) -> dist code (0..29)
{ {