aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-03-15 18:36:27 +0100
committerSverker Eriksson <[email protected]>2019-03-15 18:36:27 +0100
commit6f97929787126b9c602c769a97a5598e0c35bef4 (patch)
tree93e82f61f245e818eb78ad58fcbd1f9a370d6858 /erts
parent80f103c64904b29e2f3d880148dd5b032cae0c02 (diff)
parent98f1c565b310e5d4a04c9acdb8a6690d4cba53f4 (diff)
downloadotp-6f97929787126b9c602c769a97a5598e0c35bef4.tar.gz
otp-6f97929787126b9c602c769a97a5598e0c35bef4.tar.bz2
otp-6f97929787126b9c602c769a97a5598e0c35bef4.zip
Merge branch 'sverker/ets-select-fixation-owner-change-bug/OTP-15672'
* sverker/ets-select-fixation-owner-change-bug/OTP-15672: erts: Fix bug for yielding ets:replace
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_db_hash.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_db_hash.c b/erts/emulator/beam/erl_db_hash.c
index fac4703620..f225730029 100644
--- a/erts/emulator/beam/erl_db_hash.c
+++ b/erts/emulator/beam/erl_db_hash.c
@@ -2214,6 +2214,7 @@ static int db_select_replace_hash(Process *p, DbTable *tbl, Eterm tid,
ctx.tb = &tbl->hash;
ctx.tid = tid;
ctx.prev_continuation_tptr = NULL;
+ ctx.safety = safety;
return match_traverse(
&ctx,