From 6e5d1026735da0659df82ffd88d8d70709e69a1f Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Mon, 21 Aug 2023 19:41:03 +0200
Subject: [PATCH] Clippy fixes for frida_executable_libpng fuzzer (#1438)

---
 fuzzers/frida_executable_libpng/src/fuzzer.rs | 8 ++++----
 fuzzers/frida_executable_libpng/src/lib.rs    | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/fuzzers/frida_executable_libpng/src/fuzzer.rs b/fuzzers/frida_executable_libpng/src/fuzzer.rs
index f2361dbcda..df61717007 100644
--- a/fuzzers/frida_executable_libpng/src/fuzzer.rs
+++ b/fuzzers/frida_executable_libpng/src/fuzzer.rs
@@ -54,15 +54,15 @@ pub unsafe fn lib(main: extern "C" fn(i32, *const *const u8, *const *const u8) -
 
     let options = parse_args();
 
-    let mut frida_harness = |input: &BytesInput| {
+    let frida_harness = |input: &BytesInput| {
         let target = input.target_bytes();
         let buf = target.as_slice();
         let len = buf.len().to_string();
 
         let argv: [*const u8; 3] = [
             null(), // dummy value
-            len.as_ptr() as _,
-            buf.as_ptr() as _,
+            len.as_ptr().cast(),
+            buf.as_ptr().cast(),
         ];
 
         let env: [*const u8; 2] = [
@@ -75,7 +75,7 @@ pub unsafe fn lib(main: extern "C" fn(i32, *const *const u8, *const *const u8) -
     };
 
     unsafe {
-        match fuzz(&options, &mut frida_harness) {
+        match fuzz(&options, &frida_harness) {
             Ok(()) | Err(Error::ShuttingDown) => println!("\nFinished fuzzing. Good bye."),
             Err(e) => panic!("Error during fuzzing: {e:?}"),
         }
diff --git a/fuzzers/frida_executable_libpng/src/lib.rs b/fuzzers/frida_executable_libpng/src/lib.rs
index 5ae173639d..3090b533b0 100644
--- a/fuzzers/frida_executable_libpng/src/lib.rs
+++ b/fuzzers/frida_executable_libpng/src/lib.rs
@@ -1,3 +1,4 @@
+#![allow(clippy::missing_safety_doc)]
 use std::mem::transmute;
 
 use libc::{c_void, dlsym, RTLD_NEXT};
@@ -33,6 +34,7 @@ pub unsafe extern "C" fn main_hook(
 }
 
 #[no_mangle]
+#[allow(clippy::similar_names)]
 pub unsafe extern "C" fn __libc_start_main(
     main: extern "C" fn(i32, *const *const u8, *const *const u8) -> i32,
     argc: i32,
@@ -46,13 +48,10 @@ pub unsafe extern "C" fn __libc_start_main(
         ORIG_MAIN = main;
 
         let orig_libc_start_main_addr: *mut c_void =
-            dlsym(RTLD_NEXT, "__libc_start_main\0".as_ptr() as *const i8);
+            dlsym(RTLD_NEXT, "__libc_start_main\0".as_ptr().cast::<i8>());
 
         let orig_libc_start_main: LibcStartMainFunc = transmute(orig_libc_start_main_addr);
 
-        let exit_code =
-            orig_libc_start_main(main_hook, argc, argv, init, fini, rtld_fini, stack_end);
-
-        return exit_code;
+        orig_libc_start_main(main_hook, argc, argv, init, fini, rtld_fini, stack_end)
     }
 }