From 22c70dcb908ce983c0195660d78078e849ed44f7 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Tue, 11 Oct 2022 19:19:47 -0700
Subject: [PATCH] Fix make sandboxing logic for .STRICT mode

Patch segfaults and handle the `.STRICT = 0` case.

Fixes #659
---
 third_party/make/job.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/third_party/make/job.c b/third_party/make/job.c
index d7b789fd2..458343eca 100644
--- a/third_party/make/job.c
+++ b/third_party/make/job.c
@@ -1904,32 +1904,30 @@ child_execute_job (struct childbase *child,
     c = 0;
   }
 
-  internet = !get_target_variable(STRING_SIZE_TUPLE (".STRICT"),
-                                     c->file, 0) ||
-             parse_bool (get_target_variable
-                         (STRING_SIZE_TUPLE (".INTERNET"),
-                          c ? c->file : 0, "0"));
-
-  unsandboxed = !get_target_variable(STRING_SIZE_TUPLE (".STRICT"),
-                                     c->file, 0) ||
-                parse_bool (get_target_variable
-                            (STRING_SIZE_TUPLE (".UNSANDBOXED"),
-                             c ? c->file : 0, "0"));
-
   if (c)
     {
-      sandboxed = !unsandboxed;
       strict = parse_bool (get_target_variable
                            (STRING_SIZE_TUPLE (".STRICT"),
                             c->file, "0"));
+      internet = !strict ||
+                 parse_bool (get_target_variable
+                             (STRING_SIZE_TUPLE (".INTERNET"),
+                              c->file, "0"));
+      unsandboxed = !strict ||
+                    parse_bool (get_target_variable
+                                (STRING_SIZE_TUPLE (".UNSANDBOXED"),
+                                 c->file, "0"));
     }
   else
     {
-      sandboxed = false;
       strict = false;
+      internet = true;
+      unsandboxed = true;
     }
 
-  if (!unsandboxed)
+  sandboxed = !unsandboxed;
+
+  if (sandboxed)
     {
       promises = emptytonull (get_target_variable
                               (STRING_SIZE_TUPLE (".PLEDGE"),