Skip to content

Commit 106acdc

Browse files
committed
Add fuzzing for Witness struct
1 parent 2fd0125 commit 106acdc

File tree

4 files changed

+65
-2
lines changed

4 files changed

+65
-2
lines changed

.github/workflows/fuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
fuzz_target: [deser_net_msg, deserialize_address, deserialize_amount, deserialize_block, deserialize_psbt, deserialize_script, deserialize_transaction, outpoint_string, uint128_fuzz, script_bytes_to_asm_fmt]
14+
fuzz_target: [deser_net_msg, deserialize_address, deserialize_amount, deserialize_block, deserialize_psbt, deserialize_script, deserialize_transaction, deserialize_witness, outpoint_string, uint128_fuzz, script_bytes_to_asm_fmt]
1515
steps:
1616
- name: Install test dependencies
1717
run: sudo apt-get update -y && sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev

fuzz/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,7 @@ path = "fuzz_targets/uint128_fuzz.rs"
5959
[[bin]]
6060
name = "script_bytes_to_asm_fmt"
6161
path = "fuzz_targets/script_bytes_to_asm_fmt.rs"
62+
63+
[[bin]]
64+
name = "deserialize_witness"
65+
path = "fuzz_targets/deserialize_witness.rs"

fuzz/fuzz_targets/deserialize_transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fn do_test(data: &[u8]) {
1010
let len = ser.len();
1111
let calculated_weight = tx.get_weight();
1212
for input in &mut tx.input {
13-
input.witness = vec![];
13+
input.witness = bitcoin::blockdata::witness::Witness::default();
1414
}
1515
let no_witness_len = bitcoin::consensus::encode::serialize(&tx).len();
1616
// For 0-input transactions, `no_witness_len` will be incorrect because
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
extern crate bitcoin;
2+
3+
use bitcoin::consensus::{serialize, deserialize};
4+
use bitcoin::blockdata::witness::Witness;
5+
6+
fn do_test(data: &[u8]) {
7+
let w: Result<Witness, _> = deserialize(data);
8+
if let Ok(witness) = w {
9+
let serialized = serialize(&witness);
10+
assert_eq!(data, serialized);
11+
}
12+
}
13+
14+
#[cfg(feature = "afl")]
15+
#[macro_use] extern crate afl;
16+
#[cfg(feature = "afl")]
17+
fn main() {
18+
fuzz!(|data| {
19+
do_test(&data);
20+
});
21+
}
22+
23+
#[cfg(feature = "honggfuzz")]
24+
#[macro_use] extern crate honggfuzz;
25+
#[cfg(feature = "honggfuzz")]
26+
fn main() {
27+
loop {
28+
fuzz!(|data| {
29+
do_test(data);
30+
});
31+
}
32+
}
33+
34+
#[cfg(test)]
35+
mod tests {
36+
fn extend_vec_from_hex(hex: &str, out: &mut Vec<u8>) {
37+
let mut b = 0;
38+
for (idx, c) in hex.as_bytes().iter().enumerate() {
39+
b <<= 4;
40+
match *c {
41+
b'A'..=b'F' => b |= c - b'A' + 10,
42+
b'a'..=b'f' => b |= c - b'a' + 10,
43+
b'0'..=b'9' => b |= c - b'0',
44+
_ => panic!("Bad hex"),
45+
}
46+
if (idx & 1) == 1 {
47+
out.push(b);
48+
b = 0;
49+
}
50+
}
51+
}
52+
53+
#[test]
54+
fn duplicate_crash() {
55+
let mut a = Vec::new();
56+
extend_vec_from_hex("00", &mut a);
57+
super::do_test(&a);
58+
}
59+
}

0 commit comments

Comments
 (0)