Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw overflow_exception instead of silently cutting off data

Browse source
This commit is contained in:
Peter Conrad 2018-08-19 18:51:45 +02:00
parent 1dcacbafc9
commit 79ff75423f
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/fc/io/raw.hpp
View file

@ -172,9 +172,11 @@ namespace fc {
uint64_t v = 0; char b = 0; uint8_t by = 0; uint64_t v = 0; char b = 0; uint8_t by = 0;
do { do {
s.get(b); s.get(b);
if( by >= 64 || (by == 63 && b > 1) )
FC_THROW_EXCEPTION( overflow_exception, "Invalid packed unsigned_int!" );
v |= uint64_t(uint8_t(b) & 0x7f) << by; v |= uint64_t(uint8_t(b) & 0x7f) << by;
by += 7; by += 7;
} while( (uint8_t(b) & 0x80) && by < 64 ); } while( uint8_t(b) & 0x80 );
vi.value = static_cast<uint64_t>(v); vi.value = static_cast<uint64_t>(v);
} }

22
tests/io/varint_tests.cpp
View file

@ -62,7 +62,7 @@ static const std::vector<fc::unsigned_int> TEST_U = {
0xffffffffffffffffULL // \377\377\377\377\377\377\377\377\377\1 0xffffffffffffffffULL // \377\377\377\377\377\377\377\377\377\1
}; };
BOOST_AUTO_TEST_CASE( test_unsigned ) BOOST_AUTO_TEST_CASE( test_unsigned )
{ { try {
const std::vector<char> packed_u = fc::raw::pack<std::vector<fc::unsigned_int>>( TEST_U, 3 ); const std::vector<char> packed_u = fc::raw::pack<std::vector<fc::unsigned_int>>( TEST_U, 3 );
BOOST_CHECK_EQUAL( UINT_LENGTH, packed_u.size() ); BOOST_CHECK_EQUAL( UINT_LENGTH, packed_u.size() );
BOOST_CHECK_EQUAL( EXPECTED_UINTS, std::string( packed_u.data(), packed_u.size() ) ); BOOST_CHECK_EQUAL( EXPECTED_UINTS, std::string( packed_u.data(), packed_u.size() ) );
@ -83,22 +83,16 @@ BOOST_AUTO_TEST_CASE( test_unsigned )
BOOST_CHECK_EQUAL( TEST_U.size(), unjson_u.size() ); BOOST_CHECK_EQUAL( TEST_U.size(), unjson_u.size() );
for( size_t i = 0; i < TEST_U.size(); i++ ) for( size_t i = 0; i < TEST_U.size(); i++ )
BOOST_CHECK_EQUAL( TEST_U[i].value, unjson_u[i].value ); BOOST_CHECK_EQUAL( TEST_U[i].value, unjson_u[i].value );
} } FC_LOG_AND_RETHROW() }
BOOST_AUTO_TEST_CASE( test_limits ) BOOST_AUTO_TEST_CASE( test_limits )
{ try { { try {
static const std::string PACKED_U = "\04" static const std::string overflow = "\200\200\200\200\200\200\200\200\200\2"; // = 2^64
"\200\1" static const std::string overlong = "\200\200\200\200\200\200\200\200\300\200\1";
"\200\200\200\200\200\200\200\200\100"
"\200\200\200\200\200\200\200\200\200\201" // not terminated fc::unsigned_int dest;
"\200\200\200\200\200\200\200\200\300\201"; // not terminated BOOST_CHECK_THROW( fc::raw::unpack( std::vector<char>( overflow.begin(), overflow.end() ), dest, 3 ), fc::overflow_exception );
std::vector<fc::unsigned_int> unpacked_u; BOOST_CHECK_THROW( fc::raw::unpack( std::vector<char>( overlong.begin(), overlong.end() ), dest, 3 ), fc::overflow_exception );
fc::raw::unpack( std::vector<char>( PACKED_U.begin(), PACKED_U.end() ), unpacked_u, 3 );
BOOST_REQUIRE_EQUAL( 4, unpacked_u.size() );
BOOST_CHECK_EQUAL( 0x80, unpacked_u[0].value );
BOOST_CHECK_EQUAL( 0x4000000000000000ULL, unpacked_u[1].value );
BOOST_CHECK_EQUAL( 0x8000000000000000ULL, unpacked_u[2].value );
BOOST_CHECK_EQUAL( 0xc000000000000000ULL, unpacked_u[3].value );
} FC_LOG_AND_RETHROW() } } FC_LOG_AND_RETHROW() }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()