Skip to content

Commit 597d2f9

Browse files
committed
Merge #19548: fuzz: add missing overrides to signature_checker
c0f09c2 fuzz: add missing overrides to signature_checker (Jon Atack) Pull request description: These functions in `fuzz/signature_checker.cpp` override virtual member functions and should be marked `override` instead of `virtual`, which is for introducing a new virtual function. The overridden virtual functions are in `script/interpreter.h:151/156/161`. Also, per MarcoFalke suggestion, add missing parentheses in `fuzz/scriptnum_ops.cpp` and remove useless `unsigned int >= 0` conditional in `fuzz/script.cpp`. These changes fix 5 compile warnings in gcc 10 and 3 in clang 11/12. ACKs for top commit: vasild: ACK c0f09c2 MarcoFalke: review ACK c0f09c2 Tree-SHA512: 76ce73ec577c1f23cf8646c31d44dcd6c6303732c47187d041a8921d0d24a50163989a375352ebc221abf2ac337bc0902149be46b6f9eebc071d2f364c407f71
2 parents c7007ba + c0f09c2 commit 597d2f9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/test/fuzz/script.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
4848
if (CompressScript(script, compressed)) {
4949
const unsigned int size = compressed[0];
5050
compressed.erase(compressed.begin());
51-
assert(size >= 0 && size <= 5);
51+
assert(size <= 5);
5252
CScript decompressed_script;
5353
const bool ok = DecompressScript(decompressed_script, size, compressed);
5454
assert(ok);

src/test/fuzz/scriptnum_ops.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
3333
case 0: {
3434
const int64_t i = fuzzed_data_provider.ConsumeIntegral<int64_t>();
3535
assert((script_num == i) != (script_num != i));
36-
assert((script_num <= i) != script_num > i);
36+
assert((script_num <= i) != (script_num > i));
3737
assert((script_num >= i) != (script_num < i));
3838
// Avoid signed integer overflow:
3939
// script/script.h:264:93: runtime error: signed integer overflow: -2261405121394637306 + -9223372036854775802 cannot be represented in type 'long'

src/test/fuzz/signature_checker.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ class FuzzedSignatureChecker : public BaseSignatureChecker
2828
{
2929
}
3030

31-
virtual bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const
31+
bool CheckSig(const std::vector<unsigned char>& scriptSig, const std::vector<unsigned char>& vchPubKey, const CScript& scriptCode, SigVersion sigversion) const override
3232
{
3333
return m_fuzzed_data_provider.ConsumeBool();
3434
}
3535

36-
virtual bool CheckLockTime(const CScriptNum& nLockTime) const
36+
bool CheckLockTime(const CScriptNum& nLockTime) const override
3737
{
3838
return m_fuzzed_data_provider.ConsumeBool();
3939
}
4040

41-
virtual bool CheckSequence(const CScriptNum& nSequence) const
41+
bool CheckSequence(const CScriptNum& nSequence) const override
4242
{
4343
return m_fuzzed_data_provider.ConsumeBool();
4444
}

0 commit comments

Comments
 (0)