Skip to content

Fix issue #4081 UnicodeConversionError would generate invalid strings #4091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2015
Merged

Fix issue #4081 UnicodeConversionError would generate invalid strings #4091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/elixir/lib/exception.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,9 +704,13 @@ defmodule UnicodeConversionError do
"encoding starting at #{inspect rest}"
end

defp detail([h|_]) do
defp detail([h|_]) when is_integer(h) do
"code point #{h}"
end

defp detail([h|_]) do
detail(h)
end
end

defmodule Enum.OutOfBoundsError do
Expand Down
4 changes: 4 additions & 0 deletions lib/elixir/test/elixir/list_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@ defmodule ListTest do
"invalid code point 57343", fn ->
List.to_string([0xDFFF])
end
assert_raise UnicodeConversionError,
"invalid encoding starting at <<216, 0>>", fn ->
List.to_string(["a", "b", <<0xD800 :: size(16)>>])
end

assert_raise ArgumentError,
"cannot convert list to string. The list must contain only integers, strings or nested such lists; got: [:a, :b]", fn ->
Expand Down