SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for new clippy (#719)

Browse Source
This commit is contained in:
Dominik Maier 2022-08-05 13:34:27 +02:00 committed by GitHub
parent 3dfdba2ddc
commit 7d7601204f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libafl/src/events/mod.rs
View File

@ -126,14 +126,14 @@ impl EventConfig {
EventConfig::FromName { name_hash: a } => match other { EventConfig::FromName { name_hash: a } => match other {
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
EventConfig::AlwaysUnique => false, EventConfig::AlwaysUnique => false,
EventConfig::FromName { name_hash: b } => (a == b), EventConfig::FromName { name_hash: b } => a == b,
#[cfg(feature = "std")] #[cfg(feature = "std")]
EventConfig::AlwaysUnique | EventConfig::BuildID { id: _ } => false, EventConfig::AlwaysUnique | EventConfig::BuildID { id: _ } => false,
}, },
#[cfg(feature = "std")] #[cfg(feature = "std")]
EventConfig::BuildID { id: a } => match other { EventConfig::BuildID { id: a } => match other {
EventConfig::AlwaysUnique | EventConfig::FromName { name_hash: _ } => false, EventConfig::AlwaysUnique | EventConfig::FromName { name_hash: _ } => false,
EventConfig::BuildID { id: b } => (a == b), EventConfig::BuildID { id: b } => a == b,
}, },
} }
} }

7
libafl_frida/src/cmplog_rt.rs
View File

@ -358,16 +358,15 @@ impl CmpLogRuntime {
match op2 { match op2 {
CmplogOperandType::Imm(value) | CmplogOperandType::Cimm(value) => { CmplogOperandType::Imm(value) | CmplogOperandType::Cimm(value) => {
writer.put_ldr_reg_u64(Aarch64Register::X1, *value); writer.put_ldr_reg_u64(Aarch64Register::X1, *value);
match special_case { if let Some(inst) = special_case {
Some(inst) => match inst { match inst {
SpecialCmpLogCase::Tbz => { SpecialCmpLogCase::Tbz => {
writer.put_bytes(self.ops_handle_tbz_masking()); writer.put_bytes(self.ops_handle_tbz_masking());
} }
SpecialCmpLogCase::Tbnz => { SpecialCmpLogCase::Tbnz => {
writer.put_bytes(self.ops_handle_tbnz_masking()); writer.put_bytes(self.ops_handle_tbnz_masking());
} }
}, }
None => (),
} }
} }
CmplogOperandType::Regid(reg) => { CmplogOperandType::Regid(reg) => {