Skip to content

Commit ee8c997

Browse files
committed
Merge bitcoin/bitcoin#24402: refactor: Avoid implicit-integer-sign-change in bech32.cpp
aaaa4db Avoid implicit-integer-sign-change in bech32.cpp (MarcoFalke) fae6b26 test: Remove no longer needed suppressions (MarcoFalke) Pull request description: Clarifies sign conversion and allows to remove a file-wide suppression. Also, includes an unrelated commit to remove unused suppressions. ACKs for top commit: fanquake: ACK aaaa4db Tree-SHA512: f06181494ea8a2890b510b0e840679635633146d27568adaa0f0216a52637068d32a880316e1608e08314e032565f67b6b980cc9143f420d5c15e51ef760e7e0
2 parents 07e1464 + aaaa4db commit ee8c997

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/bech32.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,11 @@ inline unsigned char LowerCase(unsigned char c)
284284
}
285285

286286
/** Return indices of invalid characters in a Bech32 string. */
287-
bool CheckCharacters(const std::string& str, std::vector<int>& errors) {
287+
bool CheckCharacters(const std::string& str, std::vector<int>& errors)
288+
{
288289
bool lower = false, upper = false;
289290
for (size_t i = 0; i < str.size(); ++i) {
290-
unsigned char c = str[i];
291+
unsigned char c{(unsigned char)(str[i])};
291292
if (c >= 'a' && c <= 'z') {
292293
if (upper) {
293294
errors.push_back(i);

test/sanitizer_suppressions/ubsan

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,11 @@ unsigned-integer-overflow:crypto/
5151
unsigned-integer-overflow:hash.cpp
5252
unsigned-integer-overflow:policy/fees.cpp
5353
unsigned-integer-overflow:prevector.h
54-
unsigned-integer-overflow:pubkey.h
5554
unsigned-integer-overflow:script/interpreter.cpp
5655
unsigned-integer-overflow:txmempool.cpp
57-
unsigned-integer-overflow:util/strencodings.cpp
58-
implicit-integer-sign-change:bech32.cpp
5956
implicit-integer-sign-change:compat/stdin.cpp
6057
implicit-integer-sign-change:compressor.h
6158
implicit-integer-sign-change:crypto/
62-
implicit-integer-sign-change:key.cpp
6359
implicit-integer-sign-change:policy/fees.cpp
6460
implicit-integer-sign-change:prevector.h
6561
implicit-integer-sign-change:script/bitcoinconsensus.cpp

0 commit comments

Comments
 (0)