From 56c046ecf643fc0c8cf437315a9cb08169525a0b Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Tue, 25 Feb 2025 13:53:53 +0100
Subject: [PATCH] better handling for indices

---
 fuzzers/FRET/src/systemstate/stg.rs                    | 2 +-
 fuzzers/FRET/src/systemstate/target_os/freertos/mod.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuzzers/FRET/src/systemstate/stg.rs b/fuzzers/FRET/src/systemstate/stg.rs
index a188e075c7..74429db714 100644
--- a/fuzzers/FRET/src/systemstate/stg.rs
+++ b/fuzzers/FRET/src/systemstate/stg.rs
@@ -718,7 +718,7 @@ where
                 let counts = count_occurrences_sorted(&_tmp);
                 let mut top_indices = Vec::new();
                 if last_runtime >= feedbackstate.wort {
-                    top_indices.push(0xFFFF_FFFF_FFFF_FFFF); // pseudo trace to keep worts
+                    top_indices.push(u64::MAX); // pseudo trace to keep worts
                 }
                 for (k,c) in counts {
                     if let Some(reference) = feedbackstate.worst_abb_exec_count.get_mut(k) {
diff --git a/fuzzers/FRET/src/systemstate/target_os/freertos/mod.rs b/fuzzers/FRET/src/systemstate/target_os/freertos/mod.rs
index d040730aec..b442788d07 100644
--- a/fuzzers/FRET/src/systemstate/target_os/freertos/mod.rs
+++ b/fuzzers/FRET/src/systemstate/target_os/freertos/mod.rs
@@ -495,7 +495,7 @@ impl SystemTraceData for FreeRTOSTraceMetadata
     type State = FreeRTOSSystemState;
 
     fn states(&self) -> Vec<&Self::State> {
-        self.indices.iter().map(|x| self.trace_map.get(&(*x as u64)).unwrap()).collect()
+        self.indices.iter().filter_map(|x| self.trace_map.get(&(*x as u64))).collect()
     }
 
     fn intervals(&self) -> &Vec<ExecInterval> {