Skip to content

Commit 064f71c

Browse files
committed
fix merge issues
1 parent 7ce4040 commit 064f71c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

library/std/src/os/windows/process.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,9 @@ impl CommandExt for process::Command {
426426
value_ptr: *const c_void,
427427
value_size: usize,
428428
) -> &mut process::Command {
429-
self.as_inner_mut().raw_attribute_ptr(attribute, value_ptr, value_size);
429+
unsafe {
430+
self.as_inner_mut().raw_attribute_ptr(attribute, value_ptr, value_size);
431+
}
430432
self
431433
}
432434
}

library/std/src/sys/pal/windows/process.rs

+1
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ impl Command {
274274
size: value_size,
275275
pointer: value_ptr as isize,
276276
}),
277+
);
277278
}
278279

279280
pub fn spawn(

0 commit comments

Comments
 (0)