Fixes args & inherited handles.

Author: klemens-morgenstern

include/boost/process/v2/detail/utf8.hpp

@@ -44,9 +44,14 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(
     if (ec)
         detail::throw_error(ec, "size_as_utf8");
 
+
     std::basic_string<CharOut, Traits, Allocator> res(allocator);
     res.resize(req_size);
 
+    if (req_size == 0)
+        return res;
+
+
     auto res_size = convert_to_utf8(data, size, &res.front(), req_size,  ec);
     if (ec)
         detail::throw_error(ec, "convert_to_utf8");
@@ -70,6 +75,9 @@ std::basic_string<CharOut, Traits, Allocator> conv_string(
     std::basic_string<CharOut, Traits, Allocator> res(allocator);
     res.resize(req_size);
 
+    if (req_size == 0)
+        return res;
+
     auto res_size = convert_to_wide(data, size, &res.front(), req_size,  ec);
     if (ec)
         detail::throw_error(ec, "convert_to_wide");

include/boost/process/v2/windows/default_launcher.hpp

@@ -352,7 +352,6 @@ struct default_launcher
   BOOST_PROCESS_V2_DECL static 
   std::size_t escape_argv_string(wchar_t * itr, std::size_t max_size, 
                                  basic_string_view<wchar_t> ws);
-                                        
 
 
 
@@ -395,6 +394,7 @@ struct default_launcher
                    {
                       return detail::conv_string<wchar_t>(arg.data(), arg.size());
                    });
+
     return build_command_line_impl(pt, argw, L"");
   }
 
@@ -406,10 +406,11 @@ struct default_launcher
     {
       std::wstring buffer;
       buffer.resize(escaped_argv_length(pt.native()));
-      escape_argv_string(&buffer.front(), buffer.size(), pt.native());
+      
+      if (!buffer.empty())
+        escape_argv_string(&buffer.front(), buffer.size(), pt.native());
       return buffer;
     }
-
     return build_command_line_impl(pt, args, *std::begin(args));
   }
 
@@ -438,4 +439,4 @@ BOOST_PROCESS_V2_END_NAMESPACE
 
 
 
-#endif //BOOST_PROCESS_V2_WINDOWS_DEFAULT_LAUNCHER_HPP
+#endif //BOOST_PROCESS_V2_WINDOWS_DEFAULT_LAUNCHER_HPP

src/windows/default_launcher.cpp

@@ -30,14 +30,14 @@ namespace windows
     std::size_t needed_escapes = 0u;
     for (auto itr = ws.begin(); itr != ws.end(); itr ++)
     {
-      if (*itr == L' ')
+      if (*itr == quote)
         needed_escapes++;
       else if (*itr == L'\\')
       {
         auto nx = std::next(itr);
-        if (nx != ws.end() && (*nx == L' ' || *nx == L'\t'))
+        if (nx != ws.end() && *nx == L'"')
           needed_escapes ++;
-        else if (nx == ws.end() && needs_quotes)
+        else if (nx == ws.end())
           needed_escapes ++;      
       }
     }
@@ -75,17 +75,16 @@ namespace windows
       if (*it == quote) // makes it \"
         *(itr++) = L'\\';
 
-      if (*it == L'\\') // \" needs to be come \\\"
+      if (*it == L'\\') // \" needs to become \\\"
       {
         auto nx = std::next(it);
-        if (nx != ws.end() && (*nx == L' ' || *nx == L'\t'))
+        if (nx != ws.end() && *nx == L'"')
           *(itr++) = L'\\';
-        else if (nx == ws.end() && needs_quotes)
-        {
+        else if (nx == ws.end())
           *(itr++) = L'\\';
-        }
+
       }
-        
+
       *(itr++) = *it;
     }
 
@@ -127,9 +126,13 @@ namespace windows
     auto tl = get_thread_attribute_list(ec);
     if (ec)
       return;
+    
+    auto itr  = std::unique(inherited_handles.begin(), inherited_handles.end());
+    auto size = std::distance(inherited_handles.begin(), itr);
+      
     if (!::UpdateProcThreadAttribute(
         tl, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
-        inherited_handles.data(), inherited_handles.size() * sizeof(HANDLE), nullptr, nullptr))
+        inherited_handles.data(), size * sizeof(HANDLE), nullptr, nullptr))
       BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec);
   }
 

test/v2/process.cpp

@@ -256,8 +256,11 @@ BOOST_AUTO_TEST_CASE(print_args_spec_out)
     asio::writable_pipe wp{ctx};
     asio::connect_pipe(rp, wp);
 
-
-    bpv::process proc(ctx, pth, {"print-args", "&foo", "&", "", "\"\"", "\\\"", "|bar", "\"", "#foobar"}, bpv::process_stdio{/*in*/{},/*out*/wp, /*err*/ nullptr});
+    fprintf(stderr, "print_args_spec_out\n"); 
+    
+    bpv::process proc(ctx, pth, {"print-args", "&foo", "&", "", "\"\"", "\\\"", "|bar", "\"", "#foobar"}, 
+                                 bpv::process_stdio{/*in*/{},/*out*/wp, /*err*/ nullptr});
+    BOOST_CHECK(proc.running());                             
 
     wp.close();
     asio::streambuf st;
@@ -877,8 +880,8 @@ BOOST_AUTO_TEST_CASE(print_args_combined)
   asio::connect_pipe(rp, wp);
 
   bpv::process proc(ctx, pth, {"print-args", "bar", "foo"}, bpv::process_stdio{/*in*/{}, /*.out= */ wp, /* .err=*/ wp});
-
   wp.close();
+
   asio::streambuf st;
   std::istream is{&st};
   bpv::error_code ec;