david.venhoff/libnyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8 from schumilo/main

Browse Source 
fix protocol race condition
This commit is contained in:
Sergej Schumilo 2022-04-08 09:51:35 +02:00 committed by GitHub
commit 7788b934db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuzz_runner/src/nyx/qemu_process.rs
View File

@ -172,7 +172,7 @@ impl QemuProcess {
thread::sleep(time::Duration::from_secs(1)); thread::sleep(time::Duration::from_secs(1));
thread::sleep(time::Duration::from_millis(200*params.qemu_id as u64)); thread::sleep(time::Duration::from_millis(200*params.qemu_id as u64));
let mut child = if params.dump_python_code_for_inputs{ let mut child = if params.dump_python_code_for_inputs{
Command::new(&params.cmd[0]) Command::new(&params.cmd[0])
@ -192,7 +192,7 @@ impl QemuProcess {
thread::sleep(time::Duration::from_secs(1)); thread::sleep(time::Duration::from_secs(1));
thread::sleep(time::Duration::from_millis(200*params.qemu_id as u64)); thread::sleep(time::Duration::from_millis(200*params.qemu_id as u64));
let mut control = loop { let mut control = loop {
match UnixStream::connect(&params.control_filename) { match UnixStream::connect(&params.control_filename) {
@ -203,7 +203,7 @@ impl QemuProcess {
} }
}; };
if run_qemu(&mut control).is_err() { if wait_qemu(&mut control).is_err() {
return Err(format!("cannot launch QEMU-Nyx...")); return Err(format!("cannot launch QEMU-Nyx..."));
} }