From 52acce0d346256f1ad3d0562a9a3a85531a9da75 Mon Sep 17 00:00:00 2001 From: Paul Sajna Date: Wed, 14 Mar 2018 12:37:24 -0700 Subject: [PATCH] handle the null case --- src/platform/src/redox/mod.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/platform/src/redox/mod.rs b/src/platform/src/redox/mod.rs index a0b2c1d137..1fb185bb51 100644 --- a/src/platform/src/redox/mod.rs +++ b/src/platform/src/redox/mod.rs @@ -204,9 +204,11 @@ pub fn unlink(path: *const c_char) -> c_int { pub fn waitpid(pid: pid_t, stat_loc: *mut c_int, options: c_int) -> pid_t { unsafe { - let mut temp: usize = *stat_loc as usize; - let res = e(syscall::waitpid(pid as usize, &mut temp, options as usize)); - *stat_loc = temp as c_int; + let mut temp: usize = 0; + let mut res = e(syscall::waitpid(pid as usize, &mut temp, options as usize)); + if !stat_loc.is_null() { + *stat_loc = temp as c_int; + } res } }