Skip to content

Commit 2c38a00

Browse files
committed
Ensure that peer node deals with unicode
Follow-up to #10759 Related to #10194 Related to erlang/otp#8289
1 parent 41d3c68 commit 2c38a00

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Diff for: deps/rabbit/src/rabbit_peer_discovery.erl

+6-4
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ query_node_props(Nodes) when Nodes =/= [] ->
372372
%% By using a temporary intermediate hidden node, we ask Erlang not to
373373
%% connect everyone automatically.
374374
Context = rabbit_prelaunch:get_context(),
375-
VMArgs0 = ["-hidden"],
375+
VMArgs0 = ["+pc","unicode","-hidden"],
376376
VMArgs1 = case init:get_argument(boot) of
377377
{ok, [[BootFileArg]]} ->
378378
["-boot", BootFileArg | VMArgs0];
@@ -460,7 +460,7 @@ maybe_add_inetrc_arguments1(VMArgs, Val) ->
460460
%% The filename argument must be passed as a quoted string so that the
461461
%% command line is correctly parsed as an Erlang string by the temporary
462462
%% hidden node.
463-
ValString = rabbit_misc:format("~0p", [Val]),
463+
ValString = rabbit_misc:format("~0p", [unicode:characters_to_list(Val)]),
464464
["-kernel", "inetrc", ValString | VMArgs].
465465

466466
maybe_add_tls_arguments(VMArgs) ->
@@ -516,7 +516,8 @@ maybe_add_tls_arguments(VMArgs) ->
516516
%% "no_dot_erlang","-hidden"],
517517
VMArgs1 = case init:get_argument(ssl_dist_opt) of
518518
{ok, SslDistOpts0} ->
519-
SslDistOpts1 = [["-ssl_dist_opt" | SslDistOpt]
519+
SslDistOpts1 = [["-ssl_dist_opt" |
520+
unicode:characters_to_list(SslDistOpt)]
520521
|| SslDistOpt <- SslDistOpts0],
521522
SslDistOpts2 = lists:concat(SslDistOpts1),
522523
SslDistOpts2 ++ VMArgs;
@@ -533,7 +534,8 @@ maybe_add_tls_arguments(VMArgs) ->
533534
%% argument list.
534535
VMArgs2 = case init:get_argument(ssl_dist_optfile) of
535536
{ok, [[SslDistOptfileArg]]} ->
536-
["-ssl_dist_optfile", SslDistOptfileArg | VMArgs1];
537+
["-ssl_dist_optfile",
538+
unicode:characters_to_list(SslDistOptfileArg) | VMArgs1];
537539
_ ->
538540
VMArgs1
539541
end,

0 commit comments

Comments
 (0)