feature: add test-framework PoC

VirusTotal · Oct 3, 2023 · 3503f23 · 3503f23
1 parent 107275c
commit 3503f23
Show file tree

Hide file tree

Showing 6 changed files with 17,916 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/yara-x/Cargo.toml b/yara-x/Cargo.toml
@@ -120,6 +120,7 @@ yara-x-proto = { workspace = true }
 criterion = { workspace = true }
 pretty_assertions = { workspace = true }
 wasmprinter = "0.2.62"
+ihex = "3.0.0"
 yara = { version = "0.19.0", features = ["vendored"] }
 
 [[bench]]

diff --git a/yara-x/src/modules/macho/mod.rs b/yara-x/src/modules/macho/mod.rs
@@ -1437,7 +1437,10 @@ fn handle_segment_command(
         cmd: Some(sg.cmd),
         cmdsize: Some(sg.cmdsize),
         segname: Some(
-            std::str::from_utf8(&sg.segname).unwrap_or_default().to_string(),
+            std::str::from_utf8(&sg.segname)
+                .unwrap_or_default()
+                .trim_end_matches('\0')
+                .to_string(),
         ),
         vmaddr: Some(sg.vmaddr as u64),
         vmsize: Some(sg.vmsize as u64),
@@ -1469,11 +1472,13 @@ fn handle_segment_command(
             segname: Some(
                 std::str::from_utf8(&sec.segname)
                     .unwrap_or_default()
+                    .trim_end_matches('\0')
                     .to_string(),
             ),
             sectname: Some(
                 std::str::from_utf8(&sec.sectname)
                     .unwrap_or_default()
+                    .trim_end_matches('\0')
                     .to_string(),
             ),
             addr: Some(sec.addr as u64),
@@ -1552,7 +1557,10 @@ fn handle_segment_command_64(
         cmd: Some(sg.cmd),
         cmdsize: Some(sg.cmdsize),
         segname: Some(
-            std::str::from_utf8(&sg.segname).unwrap_or_default().to_string(),
+            std::str::from_utf8(&sg.segname)
+                .unwrap_or_default()
+                .trim_end_matches('\0')
+                .to_string(),
         ),
         vmaddr: Some(sg.vmaddr),
         vmsize: Some(sg.vmsize),
@@ -1584,11 +1592,13 @@ fn handle_segment_command_64(
             segname: Some(
                 std::str::from_utf8(&sec.segname)
                     .unwrap_or_default()
+                    .trim_end_matches('\0')
                     .to_string(),
             ),
             sectname: Some(
                 std::str::from_utf8(&sec.sectname)
                     .unwrap_or_default()
+                    .trim_end_matches('\0')
                     .to_string(),
             ),
             addr: Some(sec.addr),