From 147d354f8627a0076afb3cd4d5bbe8017753f7fa Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Wed, 26 Apr 2023 17:27:48 -0700 Subject: [PATCH] Tests: dropping all environment variables in a portable way. This fixes njs_unit_test crash on macOS. The issue was introduced in 0.7.8. --- src/test/njs_unit_test.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/njs_unit_test.c b/src/test/njs_unit_test.c index c04a587d..943049f1 100644 --- a/src/test/njs_unit_test.c +++ b/src/test/njs_unit_test.c @@ -25223,6 +25223,14 @@ static njs_test_suite_t njs_suites[] = }; +static const char *restricted_environ[] = { + "TZ=UTC", + "DUP=bar", + "dup=foo", + NULL, +}; + + int njs_cdecl main(int argc, char **argv) { @@ -25239,14 +25247,10 @@ main(int argc, char **argv) return (ret == NJS_DONE) ? EXIT_SUCCESS: EXIT_FAILURE; } - environ = NULL; + environ = (char **) restricted_environ; - (void) putenv((char *) "TZ=UTC"); tzset(); - (void) putenv((char *) "DUP=bar"); - (void) putenv((char *) "dup=foo"); - njs_mm_denormals(1); njs_memzero(&stat, sizeof(njs_stat_t)); -- 2.47.3