Merge branch 'john/erts/fix-iolist-bitstring-badarg/OTP-14926' into maint

4 files changed, 18 insertions, 4 deletions

diff --git a/erts/emulator/beam/binary.c b/erts/emulator/beam/binary.c
index d4db1a4188..95d324d2c1 100644
--- a/erts/emulator/beam/binary.c
+++ b/erts/emulator/beam/binary.c
@@ -953,7 +953,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/beam/erl_io_queue.c b/erts/emulator/beam/erl_io_queue.c
index 990c0c1cac..eb156cc578 100644
--- a/erts/emulator/beam/erl_io_queue.c
+++ b/erts/emulator/beam/erl_io_queue.c
@@ -1203,7 +1203,10 @@ BIF_RETTYPE iolist_to_iovec_1(BIF_ALIST_1) {
     if (is_nil(BIF_ARG_1)) {
         BIF_RET(NIL);
     } else if (is_binary(BIF_ARG_1)) {
-        if (binary_size(BIF_ARG_1) != 0) {
+        if (binary_bitsize(BIF_ARG_1) != 0) {
+            ASSERT(!(BIF_P->flags & F_DISABLE_GC));
+            BIF_ERROR(BIF_P, BADARG);
+        } else if (binary_size(BIF_ARG_1) != 0) {
             Eterm *hp = HAlloc(BIF_P, 2);
 
             BIF_RET(CONS(hp, BIF_ARG_1, NIL));
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.