Permalink
Browse files

Merge #7536: test: test leading spaces for ParseHex

f31b6b8 test: test leading space for ParseHex (Wladimir J. van der Laan)
  • Loading branch information...
laanwj committed Feb 16, 2016
2 parents 19324cf + f31b6b8 commit ce5fc02e61c8700e22601a1861295be6c4a41d74
Showing with 7 additions and 3 deletions.
  1. +4 −0 src/test/util_tests.cpp
  2. +3 −3 src/wallet/db.cpp
View
@@ -60,6 +60,10 @@ BOOST_AUTO_TEST_CASE(util_ParseHex)
result = ParseHex("12 34 56 78");
BOOST_CHECK(result.size() == 4 && result[0] == 0x12 && result[1] == 0x34 && result[2] == 0x56 && result[3] == 0x78);
// Leading space must be supported (used in CDBEnv::Salvage)
result = ParseHex(" 89 34 56 78");
BOOST_CHECK(result.size() == 4 && result[0] == 0x89 && result[1] == 0x34 && result[2] == 0x56 && result[3] == 0x78);
// Stop parsing at invalid value
result = ParseHex("1234 invalid 1234");
BOOST_CHECK(result.size() == 2 && result[0] == 0x12 && result[1] == 0x34);
View
@@ -193,9 +193,9 @@ bool CDBEnv::Salvage(const std::string& strFile, bool fAggressive, std::vector<C
// Format of bdb dump is ascii lines:
// header lines...
// HEADER=END
// hexadecimal key
// hexadecimal value
// ... repeated
// hexadecimal key
// hexadecimal value
// ... repeated
// DATA=END
string strLine;

0 comments on commit ce5fc02

Please sign in to comment.