diff options
| author | Sverker Eriksson <[email protected]> | 2018-05-17 12:19:38 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-17 12:19:38 +0200 |
| commit | 759af43a8213f6c0b39a76ae062a89b726cd4c25 (patch) | |
| tree | 949a150dc6f6decf59c81eb68bf345dfd16f6b45 /erts/emulator/test/nif_SUITE.erl | |
| parent | daf8172b510c319fab74f77e438eae3518812543 (diff) | |
| parent | d7bacbc798d608f259eb2faaaf194cb9df323018 (diff) | |
| download | otp-759af43a8213f6c0b39a76ae062a89b726cd4c25.tar.gz otp-759af43a8213f6c0b39a76ae062a89b726cd4c25.tar.bz2 otp-759af43a8213f6c0b39a76ae062a89b726cd4c25.zip | |
Merge PR-1819 from sverker/enif_binary_to_term-bug/OTP-15080
Fix bug in enif_binary_to_term for immediates
Diffstat (limited to 'erts/emulator/test/nif_SUITE.erl')
| -rw-r--r-- | erts/emulator/test/nif_SUITE.erl | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl index df521311e3..100fa006e7 100644 --- a/erts/emulator/test/nif_SUITE.erl +++ b/erts/emulator/test/nif_SUITE.erl @@ -2663,16 +2663,23 @@ nif_term_to_binary(Config) -> nif_binary_to_term(Config) -> ensure_lib_loaded(Config), - T = {#{ok => nok}, <<0:8096>>, lists:seq(1,100)}, + BigMap = maps:from_list([{I,-I} || I <- lists:seq(1,100)]), + [nif_binary_to_term_do(T) + || T <- [{#{ok => nok}, <<0:8096>>, lists:seq(1,100)}, + atom, 42, self(), BigMap]], + ok. + +nif_binary_to_term_do(T) -> + Dummy = [true|false], Bin = term_to_binary(T), Len = byte_size(Bin), - {Len,T} = binary_to_term_nif(Bin, undefined, 0), + {Len,T,Dummy} = binary_to_term_nif(Bin, undefined, 0), Len = binary_to_term_nif(Bin, self(), 0), - T = receive M -> M after 1000 -> timeout end, + {T,Dummy} = receive M -> M after 1000 -> timeout end, - {Len, T} = binary_to_term_nif(Bin, undefined, ?ERL_NIF_BIN2TERM_SAFE), + {Len,T,Dummy} = binary_to_term_nif(Bin, undefined, ?ERL_NIF_BIN2TERM_SAFE), false = binary_to_term_nif(<<131,100,0,14,"undefined_atom">>, - undefined, ?ERL_NIF_BIN2TERM_SAFE), + undefined, ?ERL_NIF_BIN2TERM_SAFE), false = binary_to_term_nif(Bin, undefined, 1), ok. |