aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_nif.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-11-22 16:14:57 +0100
committerRickard Green <[email protected]>2016-11-22 16:14:57 +0100
commitad94a4bdb24c93d3cafc7351c4c98f346a5f53cc (patch)
tree20f4f498d8ddef22e8743205f410817c51236aea /erts/emulator/beam/erl_nif.c
parent7a6973a2fa238468bb47d175908e99d230fbc0b1 (diff)
downloadotp-ad94a4bdb24c93d3cafc7351c4c98f346a5f53cc.tar.gz
otp-ad94a4bdb24c93d3cafc7351c4c98f346a5f53cc.tar.bz2
otp-ad94a4bdb24c93d3cafc7351c4c98f346a5f53cc.zip
Fix check_process_code() when NifExport is in use
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
-rw-r--r--erts/emulator/beam/erl_nif.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 55bd9f7455..e2f208badf 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -2309,6 +2309,17 @@ erts_setup_nif_gc(Process* proc, Eterm** objv, int* nobj)
return gc;
}
+int
+erts_check_nif_export_in_area(Process *p, char *start, Uint size)
+{
+ NifExport *nep = ERTS_PROC_GET_NIF_TRAP_EXPORT(p);
+ if (!nep || !nep->saved_current)
+ return 0;
+ if (ErtsInArea(nep->saved_current, start, size))
+ return 1;
+ return 0;
+}
+
/*
* Allocate a NifExport and set it in proc specific data
*/