Merge branch 'master' into master

Author: alpire

Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 members = ["."]
 
 [dependencies]
-arbitrary = "0.1"
+arbitrary = "0.2"
 
 [build-dependencies]
 cc = "1.0"

example_arbitrary/Cargo.toml

@@ -9,4 +9,4 @@ members = ["."]
 
 [dependencies]
 libfuzzer-sys = { path = ".." }
-arbitrary = "0.1"
+arbitrary = "0.2"

src/lib.rs

@@ -1,24 +1,26 @@
+pub use arbitrary;
+
 extern "C" {
     #![allow(improper_ctypes)] // we do not actually cross the FFI bound here
 
     fn rust_fuzzer_test_input(input: &[u8]);
 }
 
-#[export_name="LLVMFuzzerTestOneInput"]
+#[export_name = "LLVMFuzzerTestOneInput"]
 pub fn test_input_wrap(data: *const u8, size: usize) -> i32 {
-    ::std::panic::catch_unwind(|| unsafe {
+    let test_input = ::std::panic::catch_unwind(|| unsafe {
         let data_slice = ::std::slice::from_raw_parts(data, size);
         rust_fuzzer_test_input(data_slice);
-    })
-    .err().map(|_|
+    });
+    if test_input.err().is_some() {
         // hopefully the custom panic hook will be called before and abort the
         // process before the stack frames are unwinded.
-        ::std::process::abort()
-    );
+        ::std::process::abort();
+    }
     0
 }
 
-#[export_name="LLVMFuzzerInitialize"]
+#[export_name = "LLVMFuzzerInitialize"]
 pub fn initialize(_argc: *const isize, _argv: *const *const *const u8) -> isize {
     // Registers a panic hook that aborts the process before unwinding.
     // It is useful to abort before unwinding so that the fuzzer will then be
@@ -30,8 +32,8 @@ pub fn initialize(_argc: *const isize, _argv: *const *const *const u8) -> isize
     // https://github.com/rust-lang/cargo/issues/5423 is fixed.
     let default_hook = ::std::panic::take_hook();
     ::std::panic::set_hook(Box::new(move |panic_info| {
-            default_hook(panic_info);
-            ::std::process::abort();
+        default_hook(panic_info);
+        ::std::process::abort();
     }));
     0
 }
@@ -40,7 +42,7 @@ pub fn initialize(_argc: *const isize, _argv: *const *const *const u8) -> isize
 macro_rules! fuzz_target {
     (|$bytes:ident| $body:block) => {
         #[no_mangle]
-        pub extern fn rust_fuzzer_test_input($bytes: &[u8]) {
+        pub extern "C" fn rust_fuzzer_test_input($bytes: &[u8]) {
             $body
         }
     };
@@ -49,8 +51,8 @@ macro_rules! fuzz_target {
     };
     (|$data:ident: $dty: ty| $body:block) => {
         #[no_mangle]
-        pub extern fn rust_fuzzer_test_input(bytes: &[u8]) {
-            use arbitrary::{Arbitrary, RingBuffer};
+        pub extern "C" fn rust_fuzzer_test_input(bytes: &[u8]) {
+            use libfuzzer_sys::arbitrary::{Arbitrary, RingBuffer};
 
             let mut buf = match RingBuffer::new(bytes, bytes.len()) {
                 Ok(b) => b,