fix

Author: MikailBag

src/windows/spawn.rs

@@ -16,6 +16,7 @@ use std::{
 use winapi::{
     shared::{minwindef::TRUE, winerror::ERROR_INSUFFICIENT_BUFFER},
     um::{
+        errhandlingapi::GetLastError,
         handleapi::{CloseHandle, INVALID_HANDLE_VALUE},
         minwinbase::SECURITY_ATTRIBUTES,
         processthreadsapi::{
@@ -148,14 +149,14 @@ pub(in crate::windows) fn spawn(
         let mut startup_info: STARTUPINFOEXW = std::mem::zeroed();
         let mut proc_thread_attr_list_len = 0;
         {
-            let ret = InitializeProcThreadAttributeList(
+            InitializeProcThreadAttributeList(
                 std::ptr::null_mut(),
                 // we need only one attribute: security capabilities.
                 1,
                 0,
                 &mut proc_thread_attr_list_len,
             );
-            if ret != ERROR_INSUFFICIENT_BUFFER as i32 {
+            if GetLastError() != ERROR_INSUFFICIENT_BUFFER {
                 return Err(Error::last());
             }
         }
@@ -210,7 +211,9 @@ pub(in crate::windows) fn spawn(
             // inherit handles
             TRUE,
             creation_flags,
-            env.as_mut_ptr().cast(),
+            // TEMP DEBUG
+            std::ptr::null_mut(),
+            //env.as_mut_ptr().cast(),
             cwd.as_ptr(),
             (&mut startup_info as *mut STARTUPINFOEXW).cast(),
             &mut info,
@@ -238,6 +241,7 @@ fn quote_arg(out: &mut Vec<u16>, data: &OsStr) {
     out.push(ascii_to_u16(b'"'));
 }
 
+#[derive(Eq, PartialEq)]
 enum EncodeEnvResult {
     /// Success
     Ok,
@@ -264,8 +268,11 @@ fn encode_env(data: &[OsString]) -> (Vec<u16>, EncodeEnvResult) {
         out.push(0);
     }
     out.push(0);
+
     // let's verify capacity was correct
     debug_assert_eq!(out.capacity(), capacity);
-    debug_assert_eq!(out.len(), capacity);
+    if res == EncodeEnvResult::Ok {
+        debug_assert_eq!(out.len(), capacity);
+    }
     (out, res)
 }