Fix drcov path parsing

fuzzers/binary_only/qemu_coverage/Makefile.toml

@@ -244,7 +244,7 @@ windows_alias = "unsupported"
 command = "${TARGET_DIR}/${PROFILE_DIR}/qemu_coverage-${CARGO_MAKE_PROFILE}"
 args = [
   "--coverage-path",
-  "${TARGET_DIR}/drcov.log",
+  "${TARGET_DIR}/cov.drcov",
   "--input-dir",
   "./corpus",
   "--",
@@ -294,11 +294,11 @@ script = '''
 cargo make ${FEATURE} || exit 1
 
 cargo run --manifest-path ../../../utils/drcov_utils/Cargo.toml --bin drcov_merge -- \
-  -i ${TARGET_DIR}/drcov-000.log ${TARGET_DIR}/drcov-001.log ${TARGET_DIR}/drcov-002.log ${TARGET_DIR}/drcov-003.log \
-  --output ${TARGET_DIR}/drcov-merged.log || exit 1
+  -i ${TARGET_DIR}/cov-000.drcov ${TARGET_DIR}/cov-001.drcov ${TARGET_DIR}/cov-002.drcov ${TARGET_DIR}/cov-003.drcov \
+  --output ${TARGET_DIR}/cov-merged.drcov || exit 1
 
 TMP=$(cargo run --manifest-path ../../../utils/drcov_utils/Cargo.toml --bin drcov_dump_addrs -- \
-  -i ${TARGET_DIR}/drcov-merged.log | wc -l || exit 1)
+  -i ${TARGET_DIR}/cov-merged.drcov | wc -l || exit 1)
 
 NB_BLOCKS=$((TMP - 1))
 

libafl_targets/src/drcov.rs

@@ -251,6 +251,22 @@ fn parse_hex_to_u64(str: &str) -> Result<u64, ParseIntError> {
     u64::from_str_radix(&str[2..], 16)
 }
 
+fn parse_path(s: &str) -> Option<PathBuf> {
+    let mut chars = s.trim().chars();
+
+    // first char must be a quote
+    if chars.next()? != '\"' {
+        return None
+    }
+
+    // last char must be a quote as well
+    if chars.next_back()? != '\"' {
+        return None
+    }
+
+    Some(PathBuf::from(chars.as_str()))
+}
+
 impl DrCovReader {
     /// Parse a `drcov` file to memory.
     pub fn read<P: AsRef<Path> + ?Sized>(file: &P) -> Result<Self, Error> {
@@ -336,7 +352,7 @@ impl DrCovReader {
                 return Err(err("timestamp"));
             };
 
-            let Some(path) = split.next().map(|s| PathBuf::from(s.trim())) else {
+            let Some(path) = split.next().and_then(parse_path) else {
                 return Err(err("path"));
             };
 

utils/drcov_utils/Cargo.toml

@@ -9,6 +9,7 @@ categories = ["development-tools"]
 keywords = ["fuzzing", "libafl", "drcov"]
 
 [dependencies]
+env_logger = "0.11.6"
 libafl_targets = { workspace = true, default-features = true }
 clap = { workspace = true, features = ["derive", "wrap_help"] }
 

utils/drcov_utils/src/bin/drcov_dump_addrs.rs

@@ -23,6 +23,12 @@ pub struct Opt {
         help = "Output folder to write address files to. If none is set, this will output all addresses to stdout."
     )]
     pub out_dir: Option<PathBuf>,
+    #[arg(
+        short,
+        long,
+        help = "Print all the addresses when printing to stdout. Does not have any impact when writing addresses to a file."
+    )]
+    pub verbose: bool,
 }
 
 fn main() {
@@ -45,6 +51,9 @@ fn main() {
             continue;
         };
 
+        let mut blocks = drcov.basic_block_addresses_u64();
+        blocks.sort();
+
         if let Some(out_dir) = &opts.out_dir {
             // Write files to a directory
             let out_file = out_dir.join(
@@ -59,21 +68,40 @@ fn main() {
                 continue;
             };
 
-            println!("Dumping addresses from drcov file {input:?} to {out_file:?}");
+            println!(
+                "Dumping {} addresses from drcov file {input:?} to {out_file:?}",
+                blocks.len()
+            );
 
-            for line in drcov.basic_block_addresses_u64() {
+            for line in blocks {
                 file.write_all(format!("{line:#x}\n").as_bytes())
                     .expect("Could not write to file");
             }
         } else {
             // dump to stdout
-            println!("# Blocks covered in {input:?}:");
-
-            for line in drcov.basic_block_addresses_u64() {
-                println!("{line:#x}");
+            let modules = &drcov.module_entries;
+            println!("# {} Modules:", modules.len());
+            for module in &drcov.module_entries {
+                println!(
+                    "\t{} - [{:#020x}-{:#020x}] {}",
+                    module.id,
+                    module.base,
+                    module.end,
+                    module.path.display()
+                );
             }
-
             println!();
+
+            print!("# {} Blocks covered in {input:?}", blocks.len());
+            if opts.verbose {
+                println!(":");
+                for line in blocks {
+                    println!("{line:#x}");
+                }
+                println!();
+            } else {
+                println!(".");
+            }
         }
     }
 }

utils/drcov_utils/src/bin/drcov_merge.rs

@@ -24,6 +24,7 @@ pub struct Opt {
 }
 
 fn main() {
+    env_logger::init();
     let opts = Opt::parse();
 
     assert!(