aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/sys/common
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-02-11 14:39:46 +0100
committerSverker Eriksson <[email protected]>2019-02-11 14:39:46 +0100
commit2b8a46f154fb411c47262eb1c439a912d1fc8fd5 (patch)
tree6fe1ac4c6a5d2624a364aea9ba6068cb787c0e0e /erts/emulator/sys/common
parent0a72d1714f7d7f447a78433451c39c75da6ae103 (diff)
parent3f5c2b86b7dcd1d8b5a2eacad92b659ac9709a53 (diff)
downloadotp-2b8a46f154fb411c47262eb1c439a912d1fc8fd5.tar.gz
otp-2b8a46f154fb411c47262eb1c439a912d1fc8fd5.tar.bz2
otp-2b8a46f154fb411c47262eb1c439a912d1fc8fd5.zip
Merge branch 'sverker/enif_select-faulty-assert' into maint
* sverker/enif_select-faulty-assert: erts: Fix faulty debug assert in enif_select
Diffstat (limited to 'erts/emulator/sys/common')
-rw-r--r--erts/emulator/sys/common/erl_check_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index ac9a070bce..c39cd01e1c 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -962,7 +962,7 @@ enif_select(ErlNifEnv* env,
ErtsDrvSelectDataState *free_select = NULL;
ErtsNifSelectDataState *free_nif = NULL;
- ASSERT(!resource->monitors);
+ ASSERT(!erts_dbg_is_resource_dying(resource));
#ifdef ERTS_SYS_CONTINOUS_FD_NUMBERS
if (!grow_drv_ev_state(fd)) {