Skip to content

Commit cd80994

Browse files
author
José Valim
committed
Ensure we escape config before injecting into escript
Signed-off-by: José Valim <jose.valim@plataformatec.com.br>
1 parent e02d7bf commit cd80994

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/mix/lib/mix/tasks/escript.build.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ defmodule Mix.Tasks.Escript.Build do
221221
defp gen_main(name, module, app, language) do
222222
config =
223223
if File.regular?("config/config.exs") do
224-
Mix.Config.read!("config/config.exs")
224+
Macro.escape Mix.Config.read!("config/config.exs")
225225
else
226226
[]
227227
end
@@ -275,6 +275,7 @@ defmodule Mix.Tasks.Escript.Build do
275275
defp main_body_for(:elixir) do
276276
quote do
277277
erl_version = :erlang.system_info(:otp_release)
278+
278279
case :string.to_integer(erl_version) do
279280
{num, _} when num >= 17 -> nil
280281
_ ->

lib/mix/test/mix/tasks/escript_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ defmodule Mix.Tasks.EscriptTest do
7777
in_fixture "escripttest", fn ->
7878
File.mkdir_p! "config"
7979
File.write! "config/config.exs", """
80-
[foobar: [value: "FROM CONFIG"]]
80+
[foobar: [value: "FROM CONFIG", other: %{}]]
8181
"""
8282
Mix.Tasks.Escript.Build.run []
8383
assert_received {:mix_shell, :info, ["Generated escript escriptest with MIX_ENV=dev"]}

0 commit comments

Comments
 (0)