aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <bjorn@erlang.org>2010-09-01 16:41:07 +0200
committerBjörn Gustavsson <bjorn@erlang.org>2010-09-01 16:41:21 +0200
commite54ddf7c0d3681364b9f335fffd5f95e8d689d9b (patch)
tree46bf5219b47d26b6d4b5ac17e69ea3168ec5c5c4
parentfef717cbb47397b027cd3d92c091f5ea19251164 (diff)
parent90108371943ace300f1dcf1543545a40be035a4a (diff)
downloadotp-e54ddf7c0d3681364b9f335fffd5f95e8d689d9b.tar.gz
otp-e54ddf7c0d3681364b9f335fffd5f95e8d689d9b.tar.bz2
otp-e54ddf7c0d3681364b9f335fffd5f95e8d689d9b.zip
Merge branch 'mp/fix-hipe-on_load_crash' into dev
* mp/fix-hipe-on_load_crash: fix native code crash when calling unloaded module with on_load function OTP-8799
-rw-r--r--erts/emulator/beam/beam_bif_load.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_bif_load.c b/erts/emulator/beam/beam_bif_load.c
index 4fc271d41c..6ae9736141 100644
--- a/erts/emulator/beam/beam_bif_load.c
+++ b/erts/emulator/beam/beam_bif_load.c
@@ -337,7 +337,6 @@ BIF_RETTYPE finish_after_on_load_2(BIF_ALIST_2)
ep->code[0] == BIF_ARG_1 &&
ep->code[4] != 0) {
ep->address = (void *) ep->code[4];
- ep->code[3] = 0;
ep->code[4] = 0;
}
}