unzip: do not use getenv() and setenv() in test_I.c (#2177)

This setenv() call may clobber the memory pointed to by lang.

It is also insufficient, since you don't run in a clean environment, so
LANG may be overridden by an inherited LC_ALL or LC_CTYPE, or by the
user's .profile (remember that system() does not execute the command
directly, but passes it to a shell).

Reported-By: dag-erling (quoting)

diff --git a/unzip/test/test_I.c b/unzip/test/test_I.c
index d189edca1a5cd945b1c8540e0ee9a759445c6ffc..bc70a385911b1934d657f4a19ddd9d1290009cc8 100644 (file)
--- a/unzip/test/test_I.c
+++ b/unzip/test/test_I.c
@@ -33,7 +33,12 @@
 DEFINE_TEST(test_I)
 {
        const char *reffile = "test_I.zip";
-       const char *lang;
+#if !defined(_WIN32) || defined(__CYGWIN__)
+       const char *envstr = "env LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 "
+           "LC_CTYPE=en_US.UTF-8";
+#else
+       const char *envstr = "";
+#endif
        int r;
 
 #if HAVE_SETLOCALE
@@ -45,18 +50,12 @@ DEFINE_TEST(test_I)
        skipping("setlocale() not available on this system.");
 #endif
 
-       lang = getenv("LANG");
-       setenv("LANG", "en_US.UTF-8", 1);
        extract_reference_file(reffile);
-       r = systemf("%s -I UTF-8 %s >test.out 2>test.err", testprog, reffile);
+       r = systemf("%s %s -I UTF-8 %s >test.out 2>test.err", envstr, testprog,
+           reffile);
        assertEqualInt(0, r);
        assertNonEmptyFile("test.out");
        assertEmptyFile("test.err");
 
        assertTextFileContents("Hello, World!\n", "Γειά σου Κόσμε.txt");
-
-       if (lang == NULL)
-               unsetenv("LANG");
-       else
-               setenv("LANG", lang, 1);
 }