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

fixed build

Browse Source
This commit is contained in:
Dominik Maier 2020-12-18 12:04:20 +01:00
parent 7de1e19f78
commit 1264926813
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
afl/src/engines/mod.rs
View File

@ -3,7 +3,7 @@
use core::fmt::Debug; use core::fmt::Debug;
use core::marker::PhantomData; use core::marker::PhantomData;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::fs; use std::{fs, path::Path};
use crate::corpus::{Corpus, Testcase}; use crate::corpus::{Corpus, Testcase};
use crate::events::EventManager; use crate::events::EventManager;
@ -196,13 +196,14 @@ where
} }
} }
pub fn load_from_directory<G, C, E, ET, EM>( pub fn load_from_directory<G, C, E, ET, EM>
(
&mut self, &mut self,
corpus: &mut C, corpus: &mut C,
generator: &mut G, generator: &mut G,
engine: &mut Engine<E, OT, ET, I>, engine: &mut Engine<E, OT, ET, I>,
manager: &mut EM, manager: &mut EM,
in_dir: String, in_dir: &Path,
) -> Result<(), AflError> ) -> Result<(), AflError>
where where
G: Generator<I, R>, G: Generator<I, R>,
@ -214,9 +215,9 @@ where
for entry in fs::read_dir(in_dir)? { for entry in fs::read_dir(in_dir)? {
let entry = entry?; let entry = entry?;
let file = entry.path().display().to_string(); let path = entry.path();
let attributes = fs::metadata(file.clone()); let attributes = fs::metadata(&path);
if !attributes.is_ok() { if !attributes.is_ok() {
continue; continue;
@ -225,7 +226,7 @@ where
let attr = attributes?; let attr = attributes?;
if attr.is_file() { if attr.is_file() {
println!("Load file {}", file); println!("Load file {:?}", &path);
//let input = read_file(file); //let input = read_file(file);
//let fitness = self.evaluate_input(&input, engine.executor_mut())?; //let fitness = self.evaluate_input(&input, engine.executor_mut())?;
//if !self.add_if_interesting(corpus, input, fitness)?.is_none() { //if !self.add_if_interesting(corpus, input, fitness)?.is_none() {
@ -233,11 +234,11 @@ where
//} //}
} else if attr.is_dir() { } else if attr.is_dir() {
let _x = self.load_from_directory( let _x = self.load_from_directory(
&mut corpus, corpus,
&mut generator, generator,
&mut engine, engine,
&mut manager, manager,
file, &path,
); );
} }
} }
@ -261,14 +262,14 @@ where
EM: EventManager<C, E, OT, FT, I, R>, EM: EventManager<C, E, OT, FT, I, R>,
{ {
let mut added = 0 as u32; let mut added = 0 as u32;
for directory in in_dir { for directory in &in_dir {
let _x = self.load_from_directory( self.load_from_directory(
&mut corpus, corpus,
&mut generator, generator,
&mut engine, engine,
&mut manager, manager,
directory, Path::new(directory),
); )?;
} }
manager.log( manager.log(
0, 0,