highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-07 00:40:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix implicit-integer-sign-change in arith_uint256

Browse Source
This commit is contained in:
MarcoFalke
2022-01-13 15:57:25 +01:00
parent 290ff5ef6d
commit fa99e108e7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/arith_uint256.cpp
View File

@ -96,7 +96,7 @@ base_uint<BITS>& base_uint<BITS>::operator/=(const base_uint& b)
while (shift >= 0) { while (shift >= 0) {
if (num >= div) { if (num >= div) {
num -= div; num -= div;
pn[shift / 32] |= (1 << (shift & 31)); // set a bit of the result. pn[shift / 32] |= (1U << (shift & 31)); // set a bit of the result.
} }
div >>= 1; // shift back. div >>= 1; // shift back.
shift--; shift--;
@ -236,7 +236,7 @@ uint32_t arith_uint256::GetCompact(bool fNegative) const
nCompact >>= 8; nCompact >>= 8;
nSize++; nSize++;
} }
assert((nCompact & ~0x007fffff) == 0); assert((nCompact & ~0x007fffffU) == 0);
assert(nSize < 256); assert(nSize < 256);
nCompact |= nSize << 24; nCompact |= nSize << 24;
nCompact |= (fNegative && (nCompact & 0x007fffff) ? 0x00800000 : 0); nCompact |= (fNegative && (nCompact & 0x007fffff) ? 0x00800000 : 0);

1
test/sanitizer_suppressions/ubsan
View File

@ -62,7 +62,6 @@ unsigned-integer-overflow:txmempool.cpp
unsigned-integer-overflow:util/strencodings.cpp unsigned-integer-overflow:util/strencodings.cpp
unsigned-integer-overflow:validation.cpp unsigned-integer-overflow:validation.cpp
implicit-integer-sign-change:addrman.h implicit-integer-sign-change:addrman.h
implicit-integer-sign-change:arith_uint256.cpp
implicit-integer-sign-change:bech32.cpp implicit-integer-sign-change:bech32.cpp
implicit-integer-sign-change:common/bloom.cpp implicit-integer-sign-change:common/bloom.cpp
implicit-integer-sign-change:chain.cpp implicit-integer-sign-change:chain.cpp