Avoid triggering undefined behaviour (std::memset(nullptr, 0, 0)) if an invalid string is passed to DecodeSecret(...).
Background reading: memcpy (and friends) with NULL pointers
Steps to reproduce:
0./configure --with-sanitizers=undefined && make check && ./test/functional/test_runner.py
memory_cleanse be more robust in handling zero-length data?
141@@ -142,7 +142,9 @@ CKey DecodeSecret(const std::string& str)
142 key.Set(data.begin() + privkey_prefix.size(), data.begin() + privkey_prefix.size() + 32, compressed);
143 }
144 }
145- memory_cleanse(data.data(), data.size());
146+ if (data.data()) {
147+ memory_cleanse(data.data(), data.size());
148+ }
Shouldn’t memory_cleanse be more robust in handling zero-length data? @MarcoFalke the same for
memset?
-0 ae17de5 because it changes memory_cleanse invariant.
IMO should avoid the call to memory_cleanse.
@MarcoFalke Good point! Added commit 1cab4bb7e09c9d68e104460b67e5804848cd3c2e which removes UBSan suppression.
Please re-review :-)
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
141@@ -142,7 +142,9 @@ CKey DecodeSecret(const std::string& str)
142 key.Set(data.begin() + privkey_prefix.size(), data.begin() + privkey_prefix.size() + 32, compressed);
143 }
144 }
145- memory_cleanse(data.data(), data.size());
146+ if (data.data()) {
memory_cleanse if data.size() is zero, right?
memory_cleanse only if data.data() != nullptr and data.size() > 0.
141@@ -142,7 +142,9 @@ CKey DecodeSecret(const std::string& str)
142 key.Set(data.begin() + privkey_prefix.size(), data.begin() + privkey_prefix.size() + 32, compressed);
143 }
144 }
145- memory_cleanse(data.data(), data.size());
146+ if (data.data() != nullptr && data.size() > 0) {
!data.empty() check would be enough here?
Labels
Refactoring
Milestone
0.18.0