From 064f71c3a9ae89941cc9531498b5f4b942767326 Mon Sep 17 00:00:00 2001
From: Ulrich Hornung <hornunguli@gmx.de>
Date: Mon, 23 Sep 2024 22:14:03 +0200
Subject: [PATCH] fix merge issues

---
 library/std/src/os/windows/process.rs      | 4 +++-
 library/std/src/sys/pal/windows/process.rs | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/std/src/os/windows/process.rs b/library/std/src/os/windows/process.rs
index 5b0512f71c709..11df3a477fc7c 100644
--- a/library/std/src/os/windows/process.rs
+++ b/library/std/src/os/windows/process.rs
@@ -426,7 +426,9 @@ impl CommandExt for process::Command {
         value_ptr: *const c_void,
         value_size: usize,
     ) -> &mut process::Command {
-        self.as_inner_mut().raw_attribute_ptr(attribute, value_ptr, value_size);
+        unsafe {
+            self.as_inner_mut().raw_attribute_ptr(attribute, value_ptr, value_size);
+        }
         self
     }
 }
diff --git a/library/std/src/sys/pal/windows/process.rs b/library/std/src/sys/pal/windows/process.rs
index cd6dd8741a91c..01d34d84fe923 100644
--- a/library/std/src/sys/pal/windows/process.rs
+++ b/library/std/src/sys/pal/windows/process.rs
@@ -274,6 +274,7 @@ impl Command {
                 size: value_size,
                 pointer: value_ptr as isize,
             }),
+        );
     }
 
     pub fn spawn(