From 420fa0770f37619bfa29898d59dac45b6a477abb Mon Sep 17 00:00:00 2001 From: Harris Date: Sat, 9 May 2020 11:09:52 +0200 Subject: fuzz: use std::optional for sep_pos variable Co-authored-by: MarcoFalke --- src/test/fuzz/asmap_direct.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test') diff --git a/src/test/fuzz/asmap_direct.cpp b/src/test/fuzz/asmap_direct.cpp index 790f80237d..6d8a65f5ab 100644 --- a/src/test/fuzz/asmap_direct.cpp +++ b/src/test/fuzz/asmap_direct.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -13,20 +14,19 @@ void test_one_input(const std::vector& buffer) { // Encoding: [asmap using 1 bit / byte] 0xFF [addr using 1 bit / byte] - bool have_sep = false; - size_t sep_pos; + std::optional sep_pos_opt; for (size_t pos = 0; pos < buffer.size(); ++pos) { uint8_t x = buffer[pos]; if ((x & 0xFE) == 0) continue; if (x == 0xFF) { - if (have_sep) return; - have_sep = true; - sep_pos = pos; + if (sep_pos_opt) return; + sep_pos_opt = pos; } else { return; } } - if (!have_sep) return; // Needs exactly 1 separator + if (!sep_pos_opt) return; // Needs exactly 1 separator + const size_t sep_pos{sep_pos_opt.value()}; if (buffer.size() - sep_pos - 1 > 128) return; // At most 128 bits in IP address // Checks on asmap -- cgit v1.2.3