Fix fork thread handle leak on windows

jart · Jan 3, 2025 · 538ce33 · 538ce33
1 parent a15958e
commit 538ce33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/libc/intrin/maps.c b/libc/intrin/maps.c
@@ -24,7 +24,6 @@
 #include "libc/dce.h"
 #include "libc/intrin/describebacktrace.h"
 #include "libc/intrin/dll.h"
-#include "libc/intrin/kprintf.h"
 #include "libc/intrin/maps.h"
 #include "libc/macros.h"
 #include "libc/nexgen32e/rdtsc.h"
@@ -92,7 +91,7 @@ void __maps_init(void) {
     // https://lwn.net/Articles/725832/. if we guess too small, then
     // slackmap will create a bunch of zombie stacks in __print_maps
     // to coverup the undisclosed memory but no cost if we guess big
-    size_t guardsize = (__maps.rand % 8 + 1) * 1000 * 1024;
+    size_t guardsize = 1024 * 1024;
     guardsize += __pagesize - 1;
     guardsize &= -__pagesize;
 

diff --git a/libc/runtime/clone.c b/libc/runtime/clone.c
@@ -118,7 +118,7 @@ textwindows static errno_t CloneWindows(int (*func)(void *), char *stk,
   wt->arg = arg;
   wt->tls = tls;
   wt->sp = tip & -16;
-  if ((h = CreateThread(&kNtIsInheritable, 65536, (void *)WinThreadEntry, wt,
+  if ((h = CreateThread(0, 65536, (void *)WinThreadEntry, wt,
                         kNtStackSizeParamIsAReservation, &utid))) {
     atomic_init(ptid, utid);
     struct CosmoTib *tib = tls;

diff --git a/libc/testlib/benchmark.h b/libc/testlib/benchmark.h
@@ -71,7 +71,7 @@ static void _print_benchmark_result(double total_nanos, double work_per_run,
     work_unit = " ";
   }
 
-  printf("%8.2f %-2s %8.2f %s/s %6.2f %s %2dx %s\n", time_value, time_unit,
+  printf("%8.2f %-2s %8.2f %s/s %6.2f %s %3dx %s\n", time_value, time_unit,
          throughput, throughput_unit, work_per_run, work_unit, iterations,
          code);
 }