aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2023-06-12 19:48:47 +0100
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2023-06-12 19:48:47 +0100
commit3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f (patch)
tree62a43decd63402c85cd712623cd68dc3fc22da38
parentd2f6d2a95a9f6c1632c1ed3b5b5b67a49eb71d6b (diff)
downloadbitcoin-3ef756a5b558a1dd2fcb93bc0d4237707aa04f3f.tar.xz
Remove txmempool implicit-integer-sign-change sanitizer suppressions
-rw-r--r--src/txmempool.cpp4
-rw-r--r--test/sanitizer_suppressions/ubsan1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
index cb1d8b84ca..1286eba035 100644
--- a/src/txmempool.cpp
+++ b/src/txmempool.cpp
@@ -370,7 +370,7 @@ void CTxMemPoolEntry::UpdateDescendantState(int32_t modifySize, CAmount modifyFe
nSizeWithDescendants += modifySize;
assert(nSizeWithDescendants > 0);
nModFeesWithDescendants = SaturatingAdd(nModFeesWithDescendants, modifyFee);
- nCountWithDescendants += modifyCount;
+ nCountWithDescendants += uint64_t(modifyCount);
assert(int64_t(nCountWithDescendants) > 0);
}
@@ -379,7 +379,7 @@ void CTxMemPoolEntry::UpdateAncestorState(int32_t modifySize, CAmount modifyFee,
nSizeWithAncestors += modifySize;
assert(nSizeWithAncestors > 0);
nModFeesWithAncestors = SaturatingAdd(nModFeesWithAncestors, modifyFee);
- nCountWithAncestors += modifyCount;
+ nCountWithAncestors += uint64_t(modifyCount);
assert(int64_t(nCountWithAncestors) > 0);
nSigOpCostWithAncestors += modifySigOps;
assert(int(nSigOpCostWithAncestors) >= 0);
diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
index 6b891c462e..ae70fb49d4 100644
--- a/test/sanitizer_suppressions/ubsan
+++ b/test/sanitizer_suppressions/ubsan
@@ -56,7 +56,6 @@ implicit-integer-sign-change:prevector.h
implicit-integer-sign-change:script/bitcoinconsensus.cpp
implicit-integer-sign-change:script/interpreter.cpp
implicit-integer-sign-change:serialize.h
-implicit-integer-sign-change:txmempool.cpp
implicit-signed-integer-truncation:crypto/
implicit-unsigned-integer-truncation:crypto/
shift-base:arith_uint256.cpp