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

Fix narrowing in inflate_stream

Browse Source
This commit is contained in:
Vinnie Falco
2017-06-22 09:41:32 -07:00
parent 31b59f0b0f
commit 2900c26585
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -4,6 +4,7 @@ Version 65:
* Fix integer types in deflate_stream::bi_reverse * Fix integer types in deflate_stream::bi_reverse
* Fix narrowing in static_ostream * Fix narrowing in static_ostream
* Fix narrowing in ostream * Fix narrowing in ostream
* Fix narrowing in inflate_stream
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

10
include/beast/zlib/detail/inflate_stream.hpp
View File

@@ -1067,10 +1067,10 @@ get_fixed_tables() ->
std::uint16_t lens[320]; std::uint16_t lens[320];
std::uint16_t work[288]; std::uint16_t work[288];
std::fill(&lens[ 0], &lens[144], 8); std::fill(&lens[ 0], &lens[144], std::uint16_t{8});
std::fill(&lens[144], &lens[256], 9); std::fill(&lens[144], &lens[256], std::uint16_t{9});
std::fill(&lens[256], &lens[280], 7); std::fill(&lens[256], &lens[280], std::uint16_t{7});
std::fill(&lens[280], &lens[288], 8); std::fill(&lens[280], &lens[288], std::uint16_t{8});
{ {
error_code ec; error_code ec;
@@ -1090,7 +1090,7 @@ get_fixed_tables() ->
{ {
error_code ec; error_code ec;
auto next = &dist_[0]; auto next = &dist_[0];
std::fill(&lens[0], &lens[32], 5); std::fill(&lens[0], &lens[32], std::uint16_t{5});
inflate_table(build::dists, inflate_table(build::dists,
lens, 32, &next, &distbits, work, ec); lens, 32, &next, &distbits, work, ec);
if(ec) if(ec)