Skip to content

Commit 5034b7f

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#24217: Fix unsigned integer overflow in tapscript validation weight calculation
fadc54b Fix unsigned integer overflow in tapscript validation weight calculation (MarcoFalke) Pull request description: Change the tapscript validation weight constants from uint64_t to int64_t, since the type of m_validation_weight_left is also int64_t. Otherwise this will cause sanitizer warnings. This should be safe because signed integer overflow isn't expected to happen. ACKs for top commit: PastaPastaPasta: utACK fadc54b theStack: Code-review ACK fadc54b Tree-SHA512: 7a62d3a84733ab7827e3fa50d83f5493f2481b725c587e986eb2c128a769f023756f3ad964401526e386a847aa630a9f6c43a57d25ce5fd4af0b6bb5e0615528
2 parents 1e7564e + fadc54b commit 5034b7f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/script/script.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ static const uint32_t LOCKTIME_MAX = 0xFFFFFFFFU;
5151
static constexpr unsigned int ANNEX_TAG = 0x50;
5252

5353
// Validation weight per passing signature (Tapscript only, see BIP 342).
54-
static constexpr uint64_t VALIDATION_WEIGHT_PER_SIGOP_PASSED = 50;
54+
static constexpr int64_t VALIDATION_WEIGHT_PER_SIGOP_PASSED{50};
5555

5656
// How much weight budget is added to the witness size (Tapscript only, see BIP 342).
57-
static constexpr uint64_t VALIDATION_WEIGHT_OFFSET = 50;
57+
static constexpr int64_t VALIDATION_WEIGHT_OFFSET{50};
5858

5959
template <typename T>
6060
std::vector<unsigned char> ToByteVector(const T& in)

0 commit comments

Comments
 (0)