small sandbox fix

thought-machine · Mar 20, 2019 · fa90aca · fa90aca
1 parent b857051
commit fa90aca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-13.5.0-beta3
+13.5.0-beta4
diff --git a/tools/sandbox/main.c b/tools/sandbox/main.c
@@ -94,9 +94,6 @@ int mount_tmp() {
             fputs("Not mounting tmpfs on /tmp since TMP_DIR is a subdir\n", stderr);
             return 0;
         }
-    } else {
-        fputs("TMP_DIR not set, will not bind-mount to /tmp/plz_sandbox\n", stderr);
-        return 0;
     }
     // Remounting / as private is necessary so that the tmpfs mount isn't visible to anyone else.
     if (mount("none", "/", NULL, MS_REC | MS_PRIVATE, NULL) != 0) {
@@ -112,6 +109,10 @@ int mount_tmp() {
         perror("setenv");
         return 1;
     }
+    if (!dir) {
+        fputs("TMP_DIR not set, will not bind-mount to /tmp/plz_sandbox\n", stderr);
+        return 0;
+    }
     if (mkdir(d, S_IRWXU) != 0) {
         perror("mkdir /tmp/plz_sandbox");
         return 1;