diff options
| author | fanquake <fanquake@gmail.com> | 2023-06-21 16:34:12 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-06-21 16:40:25 +0100 |
| commit | f1b4975461364d5d40d2bfafc6b165dd5d7eec30 (patch) | |
| tree | 69871345b8c52f887f03a35ae1d663b6bde3a051 | |
| parent | d23cdf659e147e7040a3924fc20cfaf639bbf5db (diff) | |
| parent | fa31c4daac5629d14360bbe9b2cd98db4c083989 (diff) | |
Merge bitcoin/bitcoin#27921: fuzz: Avoid OOM in transaction fuzz target
fa31c4daac5629d14360bbe9b2cd98db4c083989 fuzz: Avoid OOM in transaction fuzz target (MarcoFalke)
Pull request description:
To test: `FUZZ=transaction /usr/bin/time -f '%Us %MkB' ./src/test/fuzz/fuzz ../btc_qa_assets/fuzz_seed_corpus/transaction/9dc22b51df0af05ee5a595beefb0ce291feb6b99`
Before: `0.72s 249636kB`
After: `0.30s 92128kB`
ACKs for top commit:
dergoegge:
utACK fa31c4daac5629d14360bbe9b2cd98db4c083989
Tree-SHA512: 958fc54e7af31af7db3e3e1fb37553ae24de251c7fdeea3d68ec168f03db48de6aa54a96bf971f9cc804e94ff8a02fda9c56d7e85869d62962f6f020568e3a7b
| -rw-r--r-- | src/test/fuzz/transaction.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/test/fuzz/transaction.cpp b/src/test/fuzz/transaction.cpp index 7035c53d13..c561675d1a 100644 --- a/src/test/fuzz/transaction.cpp +++ b/src/test/fuzz/transaction.cpp @@ -101,7 +101,14 @@ FUZZ_TARGET_INIT(transaction, initialize_transaction) (void)AreInputsStandard(tx, coins_view_cache); (void)IsWitnessStandard(tx, coins_view_cache); - UniValue u(UniValue::VOBJ); - TxToUniv(tx, /*block_hash=*/uint256::ZERO, /*entry=*/u); - TxToUniv(tx, /*block_hash=*/uint256::ONE, /*entry=*/u); + if (tx.GetTotalSize() < 250'000) { // Avoid high memory usage (with msan) due to json encoding + { + UniValue u{UniValue::VOBJ}; + TxToUniv(tx, /*block_hash=*/uint256::ZERO, /*entry=*/u); + } + { + UniValue u{UniValue::VOBJ}; + TxToUniv(tx, /*block_hash=*/uint256::ONE, /*entry=*/u); + } + } } |