root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #14132 from lukebakken/rabbitmq-server-14101-2
Trigger a 4.2.x alpha release build / trigger_alpha_build (push) Waiting to run Details
Test (make) / Build and Xref (1.17, 26) (push) Waiting to run Details
Test (make) / Build and Xref (1.17, 27) (push) Waiting to run Details
Test (make) / Test (1.17, 27, khepri) (push) Waiting to run Details
Test (make) / Test (1.17, 27, mnesia) (push) Waiting to run Details
Test (make) / Test mixed clusters (1.17, 27, khepri) (push) Waiting to run Details
Test (make) / Test mixed clusters (1.17, 27, mnesia) (push) Waiting to run Details
Test (make) / Type check (1.17, 27) (push) Waiting to run Details 

Follow-up to 14101
This commit is contained in:
Michael Klishin 2025-06-25 19:13:26 +04:00 committed by GitHub
parent b75fc23770 00528cb1e8
commit e1b92e41ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex vendored
View File

@ -92,8 +92,7 @@ defmodule RabbitMQ.CLI.Formatters.Json do
end
defp convert_erlang_strings(data) when is_list(data) do
# Only attempt Unicode conversion on proper lists of integers
if is_proper_list_of_integers?(data) do
try do
case :unicode.characters_to_binary(data, :utf8) do
binary when is_binary(binary) ->
# Successfully converted - it was a valid Unicode string
@ -102,9 +101,10 @@ defmodule RabbitMQ.CLI.Formatters.Json do
# Conversion failed - not a Unicode string, process as regular list
Enum.map(data, &convert_erlang_strings/1)
end
else
# Not a proper list of integers, process as regular list
Enum.map(data, &convert_erlang_strings/1)
rescue
ArgumentError ->
# badarg exception - not valid character data, process as regular list
Enum.map(data, &convert_erlang_strings/1)
end
end
@ -122,15 +122,4 @@ defmodule RabbitMQ.CLI.Formatters.Json do
end
defp convert_erlang_strings(data), do: data
# Check if data is a proper list containing only integers
defp is_proper_list_of_integers?([]), do: false # Empty lists are not strings
defp is_proper_list_of_integers?(data) when is_list(data) do
try do
Enum.all?(data, &is_integer/1)
rescue
_ -> false # Not a proper list or contains non-integers
end
end
defp is_proper_list_of_integers?(_), do: false
end