diff options
| author | Bruce Yinhe <[email protected]> | 2014-11-10 09:34:28 +0100 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-11-10 09:34:28 +0100 |
| commit | 6af3ab986ac6561db52b79fb7a6f646c4314c4e2 (patch) | |
| tree | 1307ce9d65d88c6357c9dea4b568ff75734fd7bb /erts/emulator/beam | |
| parent | 983a39ab079c9f825d31cfe349588a76824d8ef2 (diff) | |
| parent | 66a184c576d9262045194e95c752a50c74877802 (diff) | |
| download | otp-6af3ab986ac6561db52b79fb7a6f646c4314c4e2.tar.gz otp-6af3ab986ac6561db52b79fb7a6f646c4314c4e2.tar.bz2 otp-6af3ab986ac6561db52b79fb7a6f646c4314c4e2.zip | |
Merge branch 'vinoski/dirty-nif-return-gc' into maint
OTP-12300
* vinoski/dirty-nif-return-gc:
Fix gc-related problem with dirty NIFs
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index ede5f335dc..adc3520ebb 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -1646,6 +1646,7 @@ init_nif_sched_data(ErlNifEnv* env, NativeFunPtr direct_fp, NativeFunPtr indirec ep->m = env->mod_nif; ep->fp = indirect_fp; proc->freason = TRAP; + proc->arity = argc; return THE_NON_VALUE; } |