diff options
| author | Lukas Larsson <[email protected]> | 2016-08-22 14:33:29 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-08-22 14:33:29 +0200 |
| commit | 2c1897c6ca6d4bfa4e30ebfd64dcfa807a596a51 (patch) | |
| tree | 28e0aa48ec24fcaaf0ec9a1a6ac35fa9d853cdec /erts/emulator/beam | |
| parent | 80b98dcfbb72c191aec3cead4cfe4a35d5a80cd7 (diff) | |
| parent | f5a1c56f0ab2a276b5c2add54b8b0d6d276e1361 (diff) | |
| download | otp-2c1897c6ca6d4bfa4e30ebfd64dcfa807a596a51.tar.gz otp-2c1897c6ca6d4bfa4e30ebfd64dcfa807a596a51.tar.bz2 otp-2c1897c6ca6d4bfa4e30ebfd64dcfa807a596a51.zip | |
Merge branch 'lukas/erts/port_monitor_mem_leak/OTP-13818' into maint
* lukas/erts/port_monitor_mem_leak/OTP-13818:
erts: Fix port monitor memory leak
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index b5d8c5bc75..aa6af7427c 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -12276,7 +12276,6 @@ static void doit_exit_monitor(ErtsMonitor *mon, void *vpcontext) erts_port_demonitor(pcontext->p, ERTS_PORT_DEMONITOR_ORIGIN_ON_DEATHBED, prt, mon->ref, NULL); - return; /* let erts_port_demonitor do the deletion */ } else { /* remote by pid */ ASSERT(is_external_pid(mon->pid)); dep = external_pid_dist_entry(mon->pid); |