Merge pull request #13 from br0kej/dev

Newest Updates
br0kej · May 20, 2024 · 33120a9 · 33120a9
2 parents 7f7a11f + 5440275
commit 33120a9
Show file tree

Hide file tree

Showing 5 changed files with 356 additions and 26 deletions.
diff --git a/src/agfj.rs b/src/agfj.rs
@@ -178,25 +178,25 @@ impl AGFJFunc {
                 if hop_counter >= max_hops {
                     hop_counter = 0;
                     break;
-                } else {
-                    let block_offset = self.addr_idx.as_ref().unwrap()[visited.index()];
-                    let basic_block: Vec<&ACFJBlock> = self
-                        .blocks
-                        .iter()
-                        .filter(|x| x.offset == block_offset)
-                        .collect();
-
-                    if !basic_block.is_empty() {
-                        if esil {
-                            let bb_esil = basic_block.first().unwrap().get_esil_bb(reg_norm);
-                            single_disasm_walk.push(bb_esil)
-                        } else {
-                            let bb_ins = basic_block.first().unwrap().get_ins(reg_norm);
-                            single_disasm_walk.push(bb_ins)
-                        }
+                }
+                let block_offset = self.addr_idx.as_ref().unwrap()[visited.index()];
+                let basic_block: Vec<&ACFJBlock> = self
+                    .blocks
+                    .iter()
+                    .filter(|x| x.offset == block_offset)
+                    .collect();
+
+                if !basic_block.is_empty() {
+                    if esil {
+                        let bb_esil = basic_block.first().unwrap().get_esil_bb(reg_norm);
+                        single_disasm_walk.push(bb_esil)
+                    } else {
+                        let bb_ins = basic_block.first().unwrap().get_ins(reg_norm);
+                        single_disasm_walk.push(bb_ins)
                     }
-                    hop_counter += 1;
                 }
+                hop_counter += 1;
+
             }
             if pairs {
                 let single_disasm_walk: Vec<String> =

diff --git a/src/dedup.rs b/src/dedup.rs
@@ -14,8 +14,8 @@ use std::hash::{Hash, Hasher};
 use std::path::{Path, PathBuf};
 use std::string::String;
 
-use std::{fs, vec};
 use std::process::exit;
+use std::{fs, vec};
 use walkdir::{DirEntry, WalkDir};
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -124,7 +124,7 @@ impl EsilFuncStringCorpus {
             }
         }
 
-        if filepaths.len() == 0 {
+        if filepaths.is_empty() {
             error!("No files found that match the expected format (*-efs.json). Exiting.");
             exit(1);
         }