diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-16 16:29:33 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-16 16:29:33 +0100 |
| commit | 05ac1e94bf314e41b6f8747738584e233d2d944e (patch) | |
| tree | 11cf6454f488efaac6eca96566f19e27f9bdee77 /erts/emulator | |
| parent | c44638e4f7e88eea38b7a1144c311826c12c197f (diff) | |
| parent | d74d7a4cc0808e1f6e710e5d17ec55bfe093cdd9 (diff) | |
| download | otp-05ac1e94bf314e41b6f8747738584e233d2d944e.tar.gz otp-05ac1e94bf314e41b6f8747738584e233d2d944e.tar.bz2 otp-05ac1e94bf314e41b6f8747738584e233d2d944e.zip | |
Merge branch 'sverker/enif_send-noproc-fix/OTP-14229' into maint
* sverker/enif_send-noproc-fix:
erts: Fix enif_send from noproc and no msg_env
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index 19ce0f6965..4fa15a8dd8 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -690,7 +690,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid, Uint sz = size_object(msg); ErlOffHeap *ohp; Eterm *hp; - if (env && !env->tracee) { + if (c_p && !env->tracee) { full_flush_env(env); mp = erts_alloc_message_heap(rp, &rp_locks, sz, &hp, &ohp); full_cache_env(env); |