Merge branch 'main' into dev

khang06 · May 3, 2021 · 17c6fcd · 17c6fcd
2 parents 08a2d43 + a78a4b7
commit 17c6fcd
Show file tree

Hide file tree

Showing 5 changed files with 194 additions and 288 deletions.
diff --git a/fuzzers/frida_libpng/Cargo.toml b/fuzzers/frida_libpng/Cargo.toml
@@ -6,9 +6,8 @@ edition = "2018"
 build = "build.rs"
 
 [features]
-default = ["std", "frida"]
+default = ["std"]
 std = []
-frida = ["frida-gum", "frida-gum-sys"]
 
 [profile.release]
 lto = true
@@ -22,10 +21,10 @@ num_cpus = "1.0"
 which = "4.1"
 
 [target.'cfg(unix)'.dependencies]
-libafl = { path = "../../libafl/", features = [ "std" ] } #,  "llmp_small_maps", "llmp_debug"]}
+libafl = { path = "../../libafl/", features = [ "std", "llmp_compression" ] } #,  "llmp_small_maps", "llmp_debug"]}
 capstone = "0.8.0"
-frida-gum = { version = "0.4", optional = true, features = [ "auto-download", "event-sink", "invocation-listener"] }
-frida-gum-sys = { version = "0.2.4", optional = true, features = [ "auto-download", "event-sink", "invocation-listener"] }
+frida-gum = { version = "0.4", git = "https://github.com/s1341/frida-rust", features = [ "auto-download", "event-sink", "invocation-listener"] }
+#frida-gum = { version = "0.4", path = "../../../frida-rust/frida-gum", features = [ "auto-download", "event-sink", "invocation-listener"] }
 libafl_frida = { path = "../../libafl_frida", version = "0.1.0" }
 lazy_static = "1.4.0"
 libc = "0.2"

diff --git a/fuzzers/frida_libpng/harness.cc b/fuzzers/frida_libpng/harness.cc
@@ -89,7 +89,8 @@ __attribute__((noinline))
 void func3( char * alloc) {
   printf("func3\n");
   if (random() == 0) {
-    alloc[0xff] = 0xde;
+    alloc[0x1ff] = 0xde;
+    printf("alloc[0x200]: %d\n", alloc[0x200]);
   }
 }
 __attribute__((noinline))

diff --git a/libafl_frida/Cargo.toml b/libafl_frida/Cargo.toml
@@ -20,8 +20,10 @@ libc = "0.2.92"
 hashbrown = "0.11"
 libloading = "0.7.0"
 rangemap = "0.1.10"
-frida-gum = { version = "0.4.0", features = [ "auto-download", "backtrace", "event-sink", "invocation-listener"] }
-frida-gum-sys = { version = "0.2.4", features = [ "auto-download", "event-sink", "invocation-listener"] }
+frida-gum = { version = "0.4.0", git = "https://github.com/s1341/frida-rust", features = [ "auto-download", "backtrace", "event-sink", "invocation-listener"] }
+frida-gum-sys = { version = "0.2.4", git = "https://github.com/s1341/frida-rust", features = [ "auto-download", "event-sink", "invocation-listener"] }
+#frida-gum = { version = "0.4.0",  path = "../../frida-rust/frida-gum", features = [ "auto-download", "backtrace", "event-sink", "invocation-listener"] }
+#frida-gum-sys = { version = "0.2.4", path = "../../frida-rust/frida-gum-sys", features = [ "auto-download", "event-sink", "invocation-listener"] }
 regex = "1.4"
 dynasmrt = "1.0.1"
 capstone = "0.8.0"