aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2017-02-16 16:32:18 +0100
committerSverker Eriksson <[email protected]>2017-02-16 16:32:18 +0100
commit085f5b93cc48f926d4bfb3df843f19541d198552 (patch)
tree1d6266df3dfde9afd776082d6b569f256c32b384 /erts/emulator/beam
parentf0fbd26fd72dd05c6e6bcaeb706a001d669387b4 (diff)
parent05ac1e94bf314e41b6f8747738584e233d2d944e (diff)
downloadotp-085f5b93cc48f926d4bfb3df843f19541d198552.tar.gz
otp-085f5b93cc48f926d4bfb3df843f19541d198552.tar.bz2
otp-085f5b93cc48f926d4bfb3df843f19541d198552.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_nif.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 61ae57a7f0..7fe7b8bd93 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -723,7 +723,7 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid,
Uint sz;
INITIALIZE_LITERAL_PURGE_AREA(litarea);
sz = size_object_litopt(msg, &litarea);
- 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);