fuzz: Introduce CallOneOf helper to replace switch-case

Can be reviewed with --ignore-all-space
This commit is contained in:
MarcoFalke
2021-01-02 13:38:14 +01:00
parent 9c0b76c709
commit fa75d40ef8
19 changed files with 1097 additions and 1217 deletions

View File

@@ -16,56 +16,53 @@ FUZZ_TARGET(script_ops)
FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size());
CScript script = ConsumeScript(fuzzed_data_provider);
while (fuzzed_data_provider.remaining_bytes() > 0) {
switch (fuzzed_data_provider.ConsumeIntegralInRange(0, 7)) {
case 0: {
CScript s = ConsumeScript(fuzzed_data_provider);
script = std::move(s);
break;
}
case 1: {
const CScript& s = ConsumeScript(fuzzed_data_provider);
script = s;
break;
}
case 2:
script << fuzzed_data_provider.ConsumeIntegral<int64_t>();
break;
case 3:
script << ConsumeOpcodeType(fuzzed_data_provider);
break;
case 4:
script << ConsumeScriptNum(fuzzed_data_provider);
break;
case 5:
script << ConsumeRandomLengthByteVector(fuzzed_data_provider);
break;
case 6:
script.clear();
break;
case 7: {
(void)script.GetSigOpCount(false);
(void)script.GetSigOpCount(true);
(void)script.GetSigOpCount(script);
(void)script.HasValidOps();
(void)script.IsPayToScriptHash();
(void)script.IsPayToWitnessScriptHash();
(void)script.IsPushOnly();
(void)script.IsUnspendable();
{
CScript::const_iterator pc = script.begin();
opcodetype opcode;
(void)script.GetOp(pc, opcode);
std::vector<uint8_t> data;
(void)script.GetOp(pc, opcode, data);
(void)script.IsPushOnly(pc);
}
{
int version;
std::vector<uint8_t> program;
(void)script.IsWitnessProgram(version, program);
}
break;
}
}
CallOneOf(
fuzzed_data_provider,
[&] {
CScript s = ConsumeScript(fuzzed_data_provider);
script = std::move(s);
},
[&] {
const CScript& s = ConsumeScript(fuzzed_data_provider);
script = s;
},
[&] {
script << fuzzed_data_provider.ConsumeIntegral<int64_t>();
},
[&] {
script << ConsumeOpcodeType(fuzzed_data_provider);
},
[&] {
script << ConsumeScriptNum(fuzzed_data_provider);
},
[&] {
script << ConsumeRandomLengthByteVector(fuzzed_data_provider);
},
[&] {
script.clear();
},
[&] {
(void)script.GetSigOpCount(false);
(void)script.GetSigOpCount(true);
(void)script.GetSigOpCount(script);
(void)script.HasValidOps();
(void)script.IsPayToScriptHash();
(void)script.IsPayToWitnessScriptHash();
(void)script.IsPushOnly();
(void)script.IsUnspendable();
{
CScript::const_iterator pc = script.begin();
opcodetype opcode;
(void)script.GetOp(pc, opcode);
std::vector<uint8_t> data;
(void)script.GetOp(pc, opcode, data);
(void)script.IsPushOnly(pc);
}
{
int version;
std::vector<uint8_t> program;
(void)script.IsWitnessProgram(version, program);
}
});
}
}