diff options
| author | John Högberg <john@erlang.org> | 2018-02-15 17:06:36 +0100 |
|---|---|---|
| committer | John Högberg <john@erlang.org> | 2018-02-15 17:10:31 +0100 |
| commit | 443fbb24248516523512c9bc591252eafafd1311 (patch) | |
| tree | 9a42d84f7f85749d5afba867bb63bdbbc5d8651f /erts | |
| parent | ca603d7ba3e537670331754539430c704779d5ea (diff) | |
| download | erlang-443fbb24248516523512c9bc591252eafafd1311.tar.gz | |
badarg on iolist_to_binary(Bitstring)
When supplied without an enclosing list, bitstrings were returned
as-is instead of badarging.
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/binary.c | 5 | ||||
| -rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c index ca3e48e205..cf7dcb13d5 100644 --- a/erts/emulator/beam/binary.c +++ b/erts/emulator/beam/binary.c @@ -964,7 +964,10 @@ HIPE_WRAPPER_BIF_DISABLE_GC(iolist_to_binary, 1) BIF_RETTYPE iolist_to_binary_1(BIF_ALIST_1) { if (is_binary(BIF_ARG_1)) { - BIF_RET(BIF_ARG_1); + if (binary_bitsize(BIF_ARG_1) == 0) { + BIF_RET(BIF_ARG_1); + } + BIF_ERROR(BIF_P, BADARG); } return erts_list_to_binary_bif(BIF_P, BIF_ARG_1, bif_export[BIF_iolist_to_binary_1]); } 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]), |