diff options
| author | John Högberg <[email protected]> | 2018-02-19 15:36:40 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-02-19 15:36:40 +0100 |
| commit | d19fc31cba8670c2fc09a7911b4e329052a3a23d (patch) | |
| tree | 84fd21890a8786cc176db71a8c517e5a86107933 /erts/emulator/test | |
| parent | 474b2ef465cddf41d311464c48bf99dd007f270f (diff) | |
| parent | 443fbb24248516523512c9bc591252eafafd1311 (diff) | |
| download | otp-d19fc31cba8670c2fc09a7911b4e329052a3a23d.tar.gz otp-d19fc31cba8670c2fc09a7911b4e329052a3a23d.tar.bz2 otp-d19fc31cba8670c2fc09a7911b4e329052a3a23d.zip | |
Merge branch 'john/erts/fix-iolist-bitstring-badarg/OTP-14926' into maint
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 1 | ||||
| -rw-r--r-- | erts/emulator/test/iovec_SUITE.erl | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl index 61536bacd7..374f91e487 100644 --- a/erts/emulator/test/binary_SUITE.erl +++ b/erts/emulator/test/binary_SUITE.erl @@ -257,6 +257,7 @@ test_deep_bitstr(List) -> {Bin,bitstring_to_list(Bin)}. bad_list_to_binary(Config) when is_list(Config) -> + test_bad_bin(<<1:1>>), test_bad_bin(atom), test_bad_bin(42), test_bad_bin([1|2]), diff --git a/erts/emulator/test/iovec_SUITE.erl b/erts/emulator/test/iovec_SUITE.erl index 76adbe4b5e..963b7e2501 100644 --- a/erts/emulator/test/iovec_SUITE.erl +++ b/erts/emulator/test/iovec_SUITE.erl @@ -25,7 +25,8 @@ -export([integer_lists/1, binary_lists/1, empty_lists/1, empty_binary_lists/1, mixed_lists/1, improper_lists/1, illegal_lists/1, cons_bomb/1, sub_binary_lists/1, iolist_to_iovec_idempotence/1, - iolist_to_iovec_correctness/1, unaligned_sub_binaries/1]). + iolist_to_iovec_correctness/1, unaligned_sub_binaries/1, + direct_binary_arg/1]). -include_lib("common_test/include/ct.hrl"). @@ -37,7 +38,7 @@ all() -> [integer_lists, binary_lists, empty_lists, empty_binary_lists, mixed_lists, sub_binary_lists, illegal_lists, improper_lists, cons_bomb, iolist_to_iovec_idempotence, iolist_to_iovec_correctness, - unaligned_sub_binaries]. + unaligned_sub_binaries, direct_binary_arg]. init_per_suite(Config) -> Config. @@ -133,6 +134,12 @@ unaligned_sub_binaries(Config) when is_list(Config) -> true = is_iolist_equal(Optimized, UnalignedVariations), ok. +direct_binary_arg(Config) when is_list(Config) -> + {'EXIT',{badarg, _}} = (catch erlang:iolist_to_iovec(<<1:1>>)), + [<<1>>] = erlang:iolist_to_iovec(<<1>>), + [] = erlang:iolist_to_iovec(<<>>), + ok. + illegality_test(Fun, Variations) -> [{'EXIT',{badarg, _}} = (catch Fun(Variation)) || Variation <- Variations], ok. |