mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-03-03 15:38:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add better fix for Windows fork+strace TLS crashes

Browse source
This commit is contained in:
Justine Tunney 2022-10-02 07:46:34 -07:00
parent ad97775370
commit 6c60793f3a
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libc/runtime/fork-nt.c
View file

@ -87,19 +87,20 @@ static inline textwindows ssize_t ForkIo(int64_t h, char *p, size_t n,
} }
static dontinline textwindows bool ForkIo2(int64_t h, void *buf, size_t n, static dontinline textwindows bool ForkIo2(int64_t h, void *buf, size_t n,
bool32 (*fn)(), const char *sf) { bool32 (*fn)(), const char *sf,
bool ischild) {
ssize_t rc = ForkIo(h, buf, n, fn); ssize_t rc = ForkIo(h, buf, n, fn);
if (ischild) __tls_enabled = false; // prevent tls crash in kprintf
NTTRACE("%s(%ld, %p, %'zu) → %'zd% m", sf, h, buf, n, rc); NTTRACE("%s(%ld, %p, %'zu) → %'zd% m", sf, h, buf, n, rc);
return rc != -1; return rc != -1;
} }
static dontinline textwindows bool WriteAll(int64_t h, void *buf, size_t n) { static dontinline textwindows bool WriteAll(int64_t h, void *buf, size_t n) {
return ForkIo2(h, buf, n, WriteFile, "WriteFile"); return ForkIo2(h, buf, n, WriteFile, "WriteFile", false);
} }
static textwindows dontinline void ReadOrDie(int64_t h, void *buf, size_t n) { static textwindows dontinline void ReadOrDie(int64_t h, void *buf, size_t n) {
__tls_enabled = false; // prevent tls crash in kprintf if (!ForkIo2(h, buf, n, ReadFile, "ReadFile", true)) {
if (!ForkIo2(h, buf, n, ReadFile, "ReadFile")) {
AbortFork("ReadFile"); AbortFork("ReadFile");
} }
} }