diff options
Diffstat (limited to 'src/key_io.cpp')
| -rw-r--r-- | src/key_io.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/key_io.cpp b/src/key_io.cpp index 20df945d8d..c2dc511989 100644 --- a/src/key_io.cpp +++ b/src/key_io.cpp @@ -43,14 +43,16 @@ public: std::string operator()(const WitnessV0KeyHash& id) const { std::vector<unsigned char> data = {0}; - ConvertBits<8, 5, true>(data, id.begin(), id.end()); + data.reserve(33); + ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, id.begin(), id.end()); return bech32::Encode(m_params.Bech32HRP(), data); } std::string operator()(const WitnessV0ScriptHash& id) const { std::vector<unsigned char> data = {0}; - ConvertBits<8, 5, true>(data, id.begin(), id.end()); + data.reserve(53); + ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, id.begin(), id.end()); return bech32::Encode(m_params.Bech32HRP(), data); } @@ -60,7 +62,8 @@ public: return {}; } std::vector<unsigned char> data = {(unsigned char)id.version}; - ConvertBits<8, 5, true>(data, id.program, id.program + id.length); + data.reserve(1 + (id.length * 8 + 4) / 5); + ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, id.program, id.program + id.length); return bech32::Encode(m_params.Bech32HRP(), data); } @@ -94,7 +97,8 @@ CTxDestination DecodeDestination(const std::string& str, const CChainParams& par // Bech32 decoding int version = bech.second[0]; // The first 5 bit symbol is the witness version (0-16) // The rest of the symbols are converted witness program bytes. - if (ConvertBits<5, 8, false>(data, bech.second.begin() + 1, bech.second.end())) { + data.reserve(((bech.second.size() - 1) * 5) / 8); + if (ConvertBits<5, 8, false>([&](unsigned char c) { data.push_back(c); }, bech.second.begin() + 1, bech.second.end())) { if (version == 0) { { WitnessV0KeyHash keyid; |