HBSD: Fix OSX tests

Provide further protection against test failures by providing an abstraction for getting the environment variables. Signed-off-by: Shawn Webb <[email protected]>
HardenedBSD · Oct 8, 2024 · 6eafb0b · 6eafb0b
1 parent c1cb32d
commit 6eafb0b
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/libarchive/filter_fork_posix.c b/libarchive/filter_fork_posix.c
@@ -74,6 +74,16 @@ extern char *const environ[];
 
 #include "filter_fork.h"
 
+static char * const *
+__get_environment_ptr(void)
+{
+#if defined(HAVE_POSIX_SPAWNP) && defined(__FreeBSD__)
+	return environ;
+#else
+	return NULL;
+#endif
+}
+
 int
 __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout,
 		pid_t *out_child)
@@ -141,7 +151,7 @@ __archive_create_child(const char *cmd, int *child_stdin, int *child_stdout,
 			goto actions_inited;
 	}
 	r = posix_spawnp(&child, cmdline->path, &actions, NULL,
-		cmdline->argv, environ);
+		cmdline->argv, __get_environment_ptr());
 	if (r != 0)
 		goto actions_inited;
 	posix_spawn_file_actions_destroy(&actions);