Skip to content

Commit cd5439f

Browse files
authored
fix rust warnings. (#82)
* Update derive_more requirement from 0.15 to 0.99 * fix rust warnings.
1 parent e343f04 commit cd5439f

File tree

5 files changed

+21
-33
lines changed

5 files changed

+21
-33
lines changed

fuzzer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ byteorder = "1.2"
1919
chrono = "0.4"
2020
priority-queue = "0.6"
2121
num_cpus = "1.0"
22-
derive_more = "0.15"
22+
derive_more = "0.99"
2323
colored = "1.6"
2424
serde="1.0"
2525
serde_derive = "1.0"

fuzzer/src/bind_cpu.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,8 @@ pub fn bind_thread_to_cpu_core(_cid: usize) {
9494

9595
#[cfg(target_os = "linux")]
9696
pub fn bind_thread_to_cpu_core(cid: usize) {
97-
// let tid = unsafe { libc::pthread_self() };
9897
unsafe {
99-
let mut c: libc::cpu_set_t = mem::uninitialized();
98+
let mut c: libc::cpu_set_t = mem::zeroed();
10099
libc::CPU_ZERO(&mut c);
101100
libc::CPU_SET(cid, &mut c);
102101
if libc::sched_setaffinity(0, mem::size_of_val(&c), &c as *const libc::cpu_set_t) != 0 {

fuzzer/src/executor/limit.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl SetLimit for Command {
4040
Ok(())
4141
};
4242

43-
self.before_exec(func)
43+
unsafe { self.pre_exec(func) }
4444
}
4545

4646
fn setsid(&mut self) -> &mut Self {
@@ -50,7 +50,7 @@ impl SetLimit for Command {
5050
};
5151
Ok(())
5252
};
53-
self.before_exec(func)
53+
unsafe { self.pre_exec(func) }
5454
}
5555

5656
fn pipe_stdin(&mut self, fd: RawFd, is_stdin: bool) -> &mut Self {
@@ -65,7 +65,7 @@ impl SetLimit for Command {
6565
}
6666
Ok(())
6767
};
68-
self.before_exec(func)
68+
unsafe { self.pre_exec(func) }
6969
} else {
7070
self
7171
}

fuzzer/src/track/load_pin_data.rs

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,26 @@ use angora_common::tag::TagSeg;
44
use std::fs::File;
55
use std::io::{self, Read};
66
use std::{collections::HashMap, path::Path};
7+
use std::mem::MaybeUninit;
8+
use std;
79

810
fn read_struct<T, R: Read>(mut read: R) -> io::Result<T> {
9-
let num_bytes = ::std::mem::size_of::<T>();
10-
unsafe {
11-
let mut s = ::std::mem::uninitialized();
12-
let buffer = ::std::slice::from_raw_parts_mut(&mut s as *mut T as *mut u8, num_bytes);
13-
match read.read_exact(buffer) {
14-
Ok(()) => Ok(s),
15-
Err(e) => {
16-
::std::mem::forget(s);
17-
Err(e)
18-
}
19-
}
20-
}
11+
let mut obj = MaybeUninit::<T>::uninit();
12+
let num_bytes = std::mem::size_of::<T>();
13+
let buffer = unsafe{ std::slice::from_raw_parts_mut(obj.as_mut_ptr() as *mut u8, num_bytes) };
14+
read.read_exact(buffer)?;
15+
Ok(unsafe { obj.assume_init() })
2116
}
2217

2318
fn read_vector<T, R: Read>(mut read: R, size: usize) -> io::Result<Vec<T>> {
2419
let mut vec = Vec::<T>::with_capacity(size);
2520
if size > 0 {
26-
unsafe {
27-
vec.set_len(size);
28-
let num_bytes = ::std::mem::size_of::<T>() * size;
29-
let buffer =
30-
::std::slice::from_raw_parts_mut((&mut vec[..]).as_ptr() as *mut u8, num_bytes);
31-
match read.read_exact(buffer) {
32-
Ok(()) => Ok(vec),
33-
Err(e) => Err(e),
34-
}
35-
}
36-
} else {
37-
Ok(vec)
38-
}
21+
let num_bytes = std::mem::size_of::<T>() * size;
22+
unsafe { vec.set_len(size) };
23+
let buffer = unsafe {std::slice::from_raw_parts_mut((&mut vec[..]).as_mut_ptr() as *mut u8, num_bytes) } ;
24+
read.read_exact(buffer)?;
25+
}
26+
Ok(vec)
3927
}
4028

4129
pub fn get_log_data_pin(out_f: &Path) -> io::Result<LogData> {

runtime_fast/src/fast.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
use super::{shm_conds, forkcli, shm_branches};
22
use std::ops::DerefMut;
33

4-
use std::sync::{Once, ONCE_INIT};
5-
static START: Once = ONCE_INIT;
4+
use std::sync::Once;
5+
6+
static START: Once = Once::new();
67

78
#[ctor]
89
fn fast_init() {

0 commit comments

Comments
 (0)