Merge pull request #6 from Jon-Becker/fix/regex-matching

fix: bytecode regex overlap with address regex
Jon-Becker · Jul 13, 2022 · 0ccc224 · 0ccc224
2 parents df85da2 + c3f9cfd
commit 0ccc224
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/common/src/ether/evm/disassemble.rs b/common/src/ether/evm/disassemble.rs
@@ -65,10 +65,7 @@ pub fn disassemble(args: DisassemblerArgs) {
     }
 
     let contract_bytecode: String;
-    if BYTECODE_REGEX.is_match(&args.target) {
-        contract_bytecode = args.target.clone();
-    }
-    else if ADDRESS_REGEX.is_match(&args.target) {
+    if ADDRESS_REGEX.is_match(&args.target) {
 
         // push the address to the output directory
         if &output_dir != &args.output {
@@ -120,6 +117,9 @@ pub fn disassemble(args: DisassemblerArgs) {
         });
 
     }
+    else if BYTECODE_REGEX.is_match(&args.target) {
+        contract_bytecode = args.target.clone();
+    }
     else {
 
         // push the address to the output directory