diff options
author | Rickard Green <[email protected]> | 2019-03-28 19:59:58 +0100 |
---|---|---|
committer | Rickard Green <[email protected]> | 2019-04-05 14:50:27 +0200 |
commit | f2671c2ef47f8c49cd5fab6e1737ed08d99ea5d2 (patch) | |
tree | aa69869ff75dadbcdf8c3432ec370c7af409d844 /erts/emulator/beam/erl_nif.c | |
parent | 060d9110ffb305d6ce5f974788948463e481203b (diff) | |
download | otp-f2671c2ef47f8c49cd5fab6e1737ed08d99ea5d2.tar.gz otp-f2671c2ef47f8c49cd5fab6e1737ed08d99ea5d2.tar.bz2 otp-f2671c2ef47f8c49cd5fab6e1737ed08d99ea5d2.zip |
Fail when we cannot encode term in binary
Fail when we cannot encode term in binary instead of producing a
faulty result.
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
-rw-r--r-- | erts/emulator/beam/erl_nif.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index deaf35c2a1..1fbe362330 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -1344,11 +1344,18 @@ unsigned char* enif_make_new_binary(ErlNifEnv* env, size_t size, int enif_term_to_binary(ErlNifEnv *dst_env, ERL_NIF_TERM term, ErlNifBinary *bin) { - Sint size; + Uint size; byte *bp; Binary* refbin; - size = erts_encode_ext_size(term); + switch (erts_encode_ext_size(term, &size)) { + case ERTS_EXT_SZ_SYSTEM_LIMIT: + return 0; /* system limit */ + case ERTS_EXT_SZ_YIELD: + ERTS_INTERNAL_ERROR("Unexpected yield"); + case ERTS_EXT_SZ_OK: + break; + } if (!enif_alloc_binary(size, bin)) return 0; |