[SV 59230] Ensure environment variables are exportable

When checking for invalid environment variable names we searched the
entire name string instead of just the first LENGTH chars; this could
cause us to incorrectly decide the variable was not exportable.

Dmitry Goncharov <dgoncharov@users.sf.net> found this bug and
provided a test case and sample fix: I used the test but chose a
slightly different fix.

* src/variable.c (define_variable_in_set): check the variable name
not the input string.
* tests/scripts/features/targetvars: Ensure environment variable
values are exported.

diff --git a/src/variable.c b/src/variable.c
index d9e1a4a6cd30f41ed92e3adbd08f682dc3161df8..94e925fbd33b79905424868588661dfe25da09eb 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -282,6 +282,8 @@ define_variable_in_set (const char *name, size_t length,
 
   v->export = v_default;
   v->exportable = 1;
+  /* Check the nul-terminated variable name.  */
+  name = v->name;
   if (*name != '_' && (*name < 'A' || *name > 'Z')
       && (*name < 'a' || *name > 'z'))
     v->exportable = 0;

diff --git a/tests/scripts/features/targetvars b/tests/scripts/features/targetvars
index 66c7ce2d3bcb0f430ba2d79e13a5638f8d72924f..08263bf34c57d91c14d7d4732bab895a2a256dd2 100644 (file)
--- a/tests/scripts/features/targetvars
+++ b/tests/scripts/features/targetvars
@@ -281,6 +281,16 @@ all: ; $sname
 unlink("sd/$sname");
 rmdir ('sd');
 
+# SV 59230: Conditional (non-)assignment of target-specific variables should
+# preserve export settings.
+
+$ENV{hello} = 'moon';
+run_make_test(q!
+all:; @echo hello=$$hello
+dummy: hello?=world
+!,
+              '', 'hello=moon');
+
 # TEST #19: Test define/endef variables as target-specific vars
 
 # run_make_test('