fixes

AFLplusplus · Jan 18, 2025 · 3b1882a · 3b1882a
1 parent 081ebd3
commit 3b1882a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/libafl/src/mutators/multi.rs b/libafl/src/mutators/multi.rs
@@ -119,7 +119,7 @@ impl_default_multipart!(
 impl<I, S> Mutator<MultipartInput<I>, S> for CrossoverInsertMutator
 where
     S: HasCorpus<MultipartInput<I>> + HasMaxSize + HasRand,
-    I: Input + ResizableMutator<u8>,
+    I: Input + ResizableMutator<u8> + HasMutatorBytes,
 {
     fn mutate(
         &mut self,
@@ -254,7 +254,7 @@ where
 impl<I, S> Mutator<MultipartInput<I>, S> for CrossoverReplaceMutator
 where
     S: HasCorpus<MultipartInput<I>> + HasMaxSize + HasRand,
-    I: Input + ResizableMutator<u8>,
+    I: Input + ResizableMutator<u8> + HasMutatorBytes,
 {
     fn mutate(
         &mut self,

diff --git a/libafl/src/stages/unicode.rs b/libafl/src/stages/unicode.rs
@@ -49,7 +49,7 @@ pub(crate) fn extract_metadata(bytes: &[u8]) -> UnicodeIdentificationMetadata {
                 core::str::from_utf8(&bytes[i..][..e.valid_up_to()]).unwrap()
             });
             if !s.is_empty() {
-                let mut entries = bitvec![0; s.mutator_bytes().len()];
+                let mut entries = bitvec![0; s.bytes().len()];
                 for (c_idx, _) in s.char_indices() {
                     entries.set(c_idx, true);
                     visited.set(i + c_idx, true);

diff --git a/libafl_frida/src/cmplog_rt.rs b/libafl_frida/src/cmplog_rt.rs
@@ -650,7 +650,7 @@ impl CmpLogRuntime {
         Option<SpecialCmpLogCase>,
         Option<SpecialCmpLogCase>,
     )> {
-        let bytes = instr.mutator_bytes();
+        let bytes = instr._bytes();
         let mut decoder =
             iced_x86::Decoder::with_ip(64, bytes, instr.address(), DecoderOptions::NONE);
         if !decoder.can_decode() {
@@ -758,7 +758,7 @@ impl CmpLogRuntime {
         Option<(ShiftStyle, u8)>, //possible shifts: everything except MSL
         Option<SpecialCmpLogCase>,
     )> {
-        let mut instr = disas_count(&decoder, instr.mutator_bytes(), 1)[0];
+        let mut instr = disas_count(&decoder, instr._bytes(), 1)[0];
         let operands_len = instr
             .operands
             .iter()

diff --git a/libafl_frida/src/helper.rs b/libafl_frida/src/helper.rs
@@ -696,7 +696,7 @@ where
                         rt.emit_shadow_check(
                             address,
                             output,
-                            instr.mutator_bytes().len(),
+                            instr._bytes().len(),
                             details.0,
                             details.1,
                             details.2,