diff options
author | Erlang/OTP <[email protected]> | 2018-10-11 21:08:36 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2018-10-11 21:08:36 +0200 |
commit | 909517755e78f4bdc385c451f851f4499e0a163c (patch) | |
tree | 0f54e4bb8459c7a984375f3697cc71d1caf3cee7 /erts/emulator/test/bif_SUITE.erl | |
parent | 1af9112d7fed1f3fb2cd1d05fb200d813c8ff3d3 (diff) | |
parent | 97dc5e7f396129222419811c173edc7fa767b0f8 (diff) | |
download | otp-909517755e78f4bdc385c451f851f4499e0a163c.tar.gz otp-909517755e78f4bdc385c451f851f4499e0a163c.tar.bz2 otp-909517755e78f4bdc385c451f851f4499e0a163c.zip |
Merge branch 'sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590' into maint-17
* sverker/r16/binary_to_atom-utf8-crash/ERL-474/OTP-14590:
erts: Fix crash in binary_to_atom/term for invalid utf8
Diffstat (limited to 'erts/emulator/test/bif_SUITE.erl')
-rw-r--r-- | erts/emulator/test/bif_SUITE.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/emulator/test/bif_SUITE.erl b/erts/emulator/test/bif_SUITE.erl index fbc229bc53..693c259f33 100644 --- a/erts/emulator/test/bif_SUITE.erl +++ b/erts/emulator/test/bif_SUITE.erl @@ -486,6 +486,9 @@ binary_to_atom(Config) when is_list(Config) -> ?line ?BADARG(binary_to_atom(id(<<255>>), utf8)), ?line ?BADARG(binary_to_atom(id(<<255,0>>), utf8)), ?line ?BADARG(binary_to_atom(id(<<16#C0,16#80>>), utf8)), %Overlong 0. + <<B:1/binary, _/binary>> = id(<<194, 163>>), %Truncated character ERL-474 + ?BADARG(binary_to_atom(B, utf8)), + ?line [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) || C <- lists:seq(256, 16#D7FF)], ?line [?BADARG(binary_to_atom(<<C/utf8>>, utf8)) || |