diff options
| author | Sverker Eriksson <[email protected]> | 2015-04-22 14:54:00 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-04-22 14:54:00 +0200 |
| commit | b3ad09ba107de16259844fe5bc50898ae40a1a96 (patch) | |
| tree | 8f89f5510ab3e549c6b029420a0aa502c2415878 /erts/emulator/beam/global.h | |
| parent | 67acde7a3522c651982a6789c749aaf73313e913 (diff) | |
| parent | dd9ad8da73e15e89c8ab27efdd47a8bda8019957 (diff) | |
| download | otp-b3ad09ba107de16259844fe5bc50898ae40a1a96.tar.gz otp-b3ad09ba107de16259844fe5bc50898ae40a1a96.tar.bz2 otp-b3ad09ba107de16259844fe5bc50898ae40a1a96.zip | |
Merge branch 'sverk/pr632/prevent-illegal-nif-terms/OTP-12655'
* sverk/pr632/prevent-illegal-nif-terms/OTP-12655:
erts: Reject non-finite float terms in erl_drv_output_term
erts: Remove old docs about experimental NIF versions.
erts: Add enif_has_pending_exception
erts: Clearify erl_nif documentation about badarg exception
erts: Fix compile warning in enif_make_double
erts: Fix divide by zero compile error in nif_SUITE.c
erts: Fix isfinite for windows
Ensure NIF term creation disallows illegal values
Diffstat (limited to 'erts/emulator/beam/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 634fe533d0..40b043d1cc 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -52,6 +52,7 @@ struct enif_environment_t /* ErlNifEnv */ ErlHeapFragment* heap_frag; int fpe_was_unmasked; struct enif_tmp_obj_t* tmp_obj_list; + int exception_thrown; /* boolean */ }; extern void erts_pre_nif(struct enif_environment_t*, Process*, struct erl_module_nif*); |