Skip to content

Commit 7f52d47

Browse files
More defensive merge_defaults/2 #13873 #15166
1 parent fed282f commit 7f52d47

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/grow_to_count_command.ex

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,19 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowToCountCommand do
2121
errors_only: :boolean
2222
]
2323

24-
def merge_defaults([], opts) do
25-
{[], Map.merge(default_opts(), opts)}
26-
end
24+
def merge_defaults(args, opts) do
25+
args =
26+
case args do
27+
[n | rem] when is_binary(n) ->
28+
case Integer.parse(n) do
29+
{i, ""} -> [i | rem]
30+
_ -> args
31+
end
32+
33+
_ ->
34+
args
35+
end
2736

28-
def merge_defaults([node_count | rem], opts) do
29-
args = [String.to_integer(node_count) | rem]
3037
{args, Map.merge(default_opts(), opts)}
3138
end
3239

0 commit comments

Comments
 (0)