Merge pull request #889 from matthias-schoeneich/888-ampersand_in_os_…

…variables replace literal ampersand character in os variable by escaped version…
erlware · Nov 8, 2021 · a146bee · a146bee
2 parents 5587173 + d7ee9d1
commit a146bee
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
@@ -435,6 +435,7 @@ replace_os_vars() {
             slen=split(var,arr,":-")
             v=arr[1]
             e=ENVIRON[v]
+            gsub("&","\\\\\\&",e)
             if(slen > 1 && e=="") {
                 i=index(var, ":-"arr[2])
                 def=substr(var,i+2)

diff --git a/shelltests/replace_src_vars_tests/config/sys.config.src b/shelltests/replace_src_vars_tests/config/sys.config.src
@@ -5,4 +5,5 @@
                           {var5, "${VAR5}"},
                           {var6, "${VAR6:-test6:-6}"},
                           {var7, "${VAR7:-test7:-7:-7}"},
-                          {var8, ${VAR8:-888}}]}].
+                          {var8, ${VAR8:-888}},
+                          {var9, "${VAR9}"}]}].
diff --git a/shelltests/replace_src_vars_tests/replace_src_vars_tests.test b/shelltests/replace_src_vars_tests/replace_src_vars_tests.test
@@ -2,7 +2,7 @@ $ rebar3 release
 > / Release successfully assembled: /
 >= 0
 
-$ RELX_OUT_FILE_PATH=/tmp NODENAME=node1 COOKIE=cookie1 VAR1=101 VAR2=201:-test2-2 VAR3=VA:-test3-2 VAR4=VAR4:-test4-2 VAR5=test5-2 VAR6=test6:-6-2 VAR7=test7:-7:-7-2 ./_build/default/rel/replace_os_vars_tests/bin/replace_os_vars_tests daemon
+$ RELX_OUT_FILE_PATH=/tmp NODENAME=node1 COOKIE=cookie1 VAR1=101 VAR2=201:-test2-2 VAR3=VA:-test3-2 VAR4=VAR4:-test4-2 VAR5=test5-2 VAR6=test6:-6-2 VAR7=test7:-7:-7-2 VAR9="ab&cd" ./_build/default/rel/replace_os_vars_tests/bin/replace_os_vars_tests daemon
 >= 0
 
 $ sleep 1
@@ -59,6 +59,11 @@ $ NODENAME=node1 COOKIE=cookie1 ./_build/default/rel/replace_os_vars_tests/bin/r
 888
 >= 0
 
+$ NODENAME=node1 COOKIE=cookie1 ./_build/default/rel/replace_os_vars_tests/bin/replace_os_vars_tests eval '{ok, [$a,$b,$&,$c,$d] = V} = application:get_env(replace_os_vars_tests, var9), V.'
+>
+"ab&cd"
+>= 0
+
 $ NODENAME=node1 COOKIE=cookie1 ./_build/default/rel/replace_os_vars_tests/bin/replace_os_vars_tests eval '[Node,_] = re:split(atom_to_list(node()), "@"),binary_to_list(Node).'
 >
 "node1"