]> git.kaiwu.me - njs.git/commitdiff
Tests: dropping all environment variables in a portable way.
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 27 Apr 2023 00:27:48 +0000 (17:27 -0700)
committerDmitry Volyntsev <xeioex@nginx.com>
Thu, 27 Apr 2023 00:27:48 +0000 (17:27 -0700)
This fixes njs_unit_test crash on macOS.

The issue was introduced in 0.7.8.

src/test/njs_unit_test.c

index c04a587dfb0488b557317e84e4d1d08b3bb4263f..943049f1e48a6aa86b20d83051d352d0247de00f 100644 (file)
@@ -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));