diff options
| author | Sverker Eriksson <sverker@erlang.org> | 2018-09-19 16:23:52 +0200 |
|---|---|---|
| committer | Sverker Eriksson <sverker@erlang.org> | 2018-09-19 16:23:52 +0200 |
| commit | 7647dc181ad1c5aa17b0e4ccb19ef584ff88c45e (patch) | |
| tree | 03af04c1ec28cf1affe5ffb53f2ac9e56507bdb9 | |
| parent | 60abdddf4bc5a25ca31af151642ca59c7dd07e92 (diff) | |
| download | erlang-7647dc181ad1c5aa17b0e4ccb19ef584ff88c45e.tar.gz | |
erts: Fix memory leak when sending to terminating port
Cherry-picked from 7c5fcd3f2701cbb614930682ac52ff75b9c26e6c
Error: Leak_DefinitelyLost
erts_alloc:230 (-> 0x52E54D) [erl_alloc.h]
port_task_alloc:154 (-> 0x52F3CA) [erl_port_task.c]
erts_port_task_alloc_p2p_sig_data:212 (-> 0x52F5D3) [erl_port_task.c]
erts_port_output:2147 (-> 0x4F6057) [io.c]
erts_port_command:4126 (-> 0x4FA10E) [io.c]
do_send:2200 (-> 0x4E4C64) [bif.c]
erl_send:2494 (-> 0x4E5E09) [bif.c]
process_main:1730 (-> 0x43ADA5) [beam_emu.c]
| -rw-r--r-- | erts/emulator/beam/erl_port_task.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_port_task.c b/erts/emulator/beam/erl_port_task.c index ddcca06b0a..ec4f3957c0 100644 --- a/erts/emulator/beam/erl_port_task.c +++ b/erts/emulator/beam/erl_port_task.c @@ -1426,10 +1426,10 @@ erts_port_task_schedule(Eterm id, } #endif - if (!pp) - goto fail; - if (type != ERTS_PORT_TASK_PROC_SIG) { + if (!pp) + goto fail; + ptp = port_task_alloc(); ptp->type = type; @@ -1467,6 +1467,9 @@ erts_port_task_schedule(Eterm id, ptp->u.alive.td.psig.callback = va_arg(argp, ErtsProc2PortSigCallback); ptp->u.alive.flags |= va_arg(argp, int); va_end(argp); + if (!pp) + goto fail; + if (!(ptp->u.alive.flags & ERTS_PT_FLG_NOSUSPEND)) set_tmp_handle(ptp, pthp); else { |