diff options
| author | Sverker Eriksson <[email protected]> | 2013-11-27 19:43:57 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-11-27 19:43:57 +0100 |
| commit | 3e2a0ea59898ba214197b7a6f5df526d80697b7a (patch) | |
| tree | abe4c522984b46fd1277e05c2ec0d7c1c1efdf3a /erts/emulator/test | |
| parent | d9ea7e090a4761f0ec42f727a67463f8b71f6544 (diff) | |
| parent | 06188473247fd1edc873d82cf07886fa7e53e8cb (diff) | |
| download | otp-3e2a0ea59898ba214197b7a6f5df526d80697b7a.tar.gz otp-3e2a0ea59898ba214197b7a6f5df526d80697b7a.tar.bz2 otp-3e2a0ea59898ba214197b7a6f5df526d80697b7a.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/binary_SUITE.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/erts/emulator/test/binary_SUITE.erl b/erts/emulator/test/binary_SUITE.erl index 08ab094019..a340a805b5 100644 --- a/erts/emulator/test/binary_SUITE.erl +++ b/erts/emulator/test/binary_SUITE.erl @@ -631,7 +631,13 @@ safe_binary_to_term2(Config) when is_list(Config) -> bad_terms(suite) -> []; bad_terms(Config) when is_list(Config) -> - ?line test_terms(fun corrupter/1). + ?line test_terms(fun corrupter/1), + {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,3:32,0,11,22,33>>)), + {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,3:32,9,11,22,33>>)), + {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,0:32,1,11,22,33>>)), + {'EXIT',{badarg,_}} = (catch binary_to_term(<<131,$M,-1:32,1,11,22,33>>)), + ok. + corrupter(Term) when is_function(Term); is_function(hd(Term)); @@ -1221,14 +1227,9 @@ gc() -> gc1() -> ok. bit_sized_binary_sizes(Config) when is_list(Config) -> - ?line [bsbs_1(A) || A <- lists:seq(0, 7)], + ?line [bsbs_1(A) || A <- lists:seq(1, 8)], ok. -bsbs_1(0) -> - BinSize = 32+8, - io:format("A: ~p BinSize: ~p", [0,BinSize]), - Bin = binary_to_term(<<131,$M,5:32,0,0,0,0,0,0>>), - BinSize = bit_size(Bin); bsbs_1(A) -> BinSize = 32+A, io:format("A: ~p BinSize: ~p", [A,BinSize]), |