Skip to content

Commit fa83210

Browse files
author
MarcoFalke
committed
Avoid integer sanitizer warnings in chain.o
1 parent bd482b3 commit fa83210

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

src/chain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ int64_t GetBlockProofEquivalentTime(const CBlockIndex& to, const CBlockIndex& fr
151151
if (r.bits() > 63) {
152152
return sign * std::numeric_limits<int64_t>::max();
153153
}
154-
return sign * r.GetLow64();
154+
return sign * int64_t(r.GetLow64());
155155
}
156156

157157
/** Find the last common ancestor two blocks have.

src/chain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ class CChain
462462
/** Return the maximal height in the chain. Is equal to chain.Tip() ? chain.Tip()->nHeight : -1. */
463463
int Height() const
464464
{
465-
return vChain.size() - 1;
465+
return int(vChain.size()) - 1;
466466
}
467467

468468
/** Set/initialize a chain with a given tip. */

test/sanitizer_suppressions/ubsan

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ unsigned-integer-overflow:addrman.cpp
4747
unsigned-integer-overflow:arith_uint256.h
4848
unsigned-integer-overflow:bitcoin-tx.cpp
4949
unsigned-integer-overflow:common/bloom.cpp
50-
unsigned-integer-overflow:chain.cpp
51-
unsigned-integer-overflow:chain.h
5250
unsigned-integer-overflow:coins.cpp
5351
unsigned-integer-overflow:compressor.cpp
5452
unsigned-integer-overflow:core_write.cpp
@@ -64,8 +62,6 @@ unsigned-integer-overflow:validation.cpp
6462
implicit-integer-sign-change:addrman.h
6563
implicit-integer-sign-change:bech32.cpp
6664
implicit-integer-sign-change:common/bloom.cpp
67-
implicit-integer-sign-change:chain.cpp
68-
implicit-integer-sign-change:chain.h
6965
implicit-integer-sign-change:coins.h
7066
implicit-integer-sign-change:compat/stdin.cpp
7167
implicit-integer-sign-change:compressor.h
@@ -80,10 +76,8 @@ implicit-integer-sign-change:serialize.h
8076
implicit-integer-sign-change:test/streams_tests.cpp
8177
implicit-integer-sign-change:txmempool.cpp
8278
implicit-integer-sign-change:zmq/zmqpublishnotifier.cpp
83-
implicit-signed-integer-truncation,implicit-integer-sign-change:chain.h
8479
implicit-signed-integer-truncation:addrman.cpp
8580
implicit-signed-integer-truncation:addrman.h
86-
implicit-signed-integer-truncation:chain.h
8781
implicit-signed-integer-truncation:crypto/
8882
implicit-signed-integer-truncation:node/miner.cpp
8983
implicit-signed-integer-truncation:net.cpp

0 commit comments

Comments
 (0)